diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2024-01-31 02:12:43 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2024-01-31 02:12:43 +0900 |
| commit | 930f9541d64aba3ee41d73187f38a5c893dd036c (patch) | |
| tree | a2666547ad816bf973a62e89f3cc522b87892b34 | |
| parent | 1def92a2a42bacd23eaff8d7a66445abeda49be1 (diff) | |
| parent | bc144e5bd50c8ce218f24cbceaf08c772fd5f081 (diff) | |
| download | bird-930f9541d64aba3ee41d73187f38a5c893dd036c.tar.gz | |
Merge branch 'ky/debian-remove-config' into rhe
* ky/debian-remove-config:
Debian: Do not install bird.conf into /etc/bird
| -rw-r--r-- | debian/bird2.postinst | 4 | ||||
| -rw-r--r-- | debian/bird2.postrm | 20 |
2 files changed, 0 insertions, 24 deletions
diff --git a/debian/bird2.postinst b/debian/bird2.postinst index 8f85b15a..ce1d55bc 100644 --- a/debian/bird2.postinst +++ b/debian/bird2.postinst @@ -8,10 +8,6 @@ if [ "$1" = "configure" ]; then fi dpkg-statoverride --list /etc/bird > /dev/null || dpkg-statoverride --update --add bird bird 0750 /etc/bird - - ucf /usr/share/bird2/bird.conf /etc/bird/bird.conf - ucfr -f bird2 /etc/bird/bird.conf - dpkg-statoverride --list /etc/bird/bird.conf > /dev/null || dpkg-statoverride --update --add bird bird 0640 /etc/bird/bird.conf fi #DEBHELPER# diff --git a/debian/bird2.postrm b/debian/bird2.postrm index ab03e6e6..b5201380 100644 --- a/debian/bird2.postrm +++ b/debian/bird2.postrm @@ -1,26 +1,6 @@ #!/bin/sh set -e -if test "$1" = "purge"; then - - # Check if there is no collision of ownership of /etc/bird/bird.conf - if ! command -v ucf ucfr >/dev/null || ucfr bird2 /etc/bird/bird.conf 2>/dev/null; then - dpkg-statoverride --remove /etc/bird >/dev/null 2>/dev/null || true - dpkg-statoverride --remove /etc/bird/bird.conf >/dev/null 2>/dev/null || true - - for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist; do - rm -f /etc/bird/bird.conf$ext - done - rm -f /etc/bird/bird.conf - if command -v ucf ucfr >/dev/null; then - ucf --purge /etc/bird/bird.conf - ucfr --purge bird2 /etc/bird/bird.conf - fi - - deluser --quiet bird > /dev/null || true - fi -fi - #DEBHELPER# exit 0 |