diff options
| author | Ondřej Surý <ondrej@debian.org> | 2020-03-02 10:19:22 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@debian.org> | 2020-03-02 10:19:22 +0100 |
| commit | 9c567504b0b5f00b924bd0298ca2e5cb505f545f (patch) | |
| tree | 63478ffb685802c811002720909b966060cfe4bb | |
| parent | 24df8d236f6be93f001da5bbc0a52abbedc1598b (diff) | |
| download | bird-9c567504b0b5f00b924bd0298ca2e5cb505f545f.tar.gz | |
Don't use /usr/share/doc as ucf source (Closes: #945336)
| -rw-r--r-- | debian/bird2.install | 2 | ||||
| -rw-r--r-- | debian/bird2.postinst | 8 | ||||
| -rw-r--r-- | debian/bird2.postrm | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/debian/bird2.install b/debian/bird2.install index 3a0c25ea..d0fad47d 100644 --- a/debian/bird2.install +++ b/debian/bird2.install @@ -1,4 +1,4 @@ -etc/bird/bird.conf /usr/share/doc/bird2/examples/ +etc/bird/bird.conf /usr/share/bird2/ debian/envvars /etc/bird/ debian/prepare-environment /usr/lib/bird/ usr/sbin/bird diff --git a/debian/bird2.postinst b/debian/bird2.postinst index 50d8ffba..8f85b15a 100644 --- a/debian/bird2.postinst +++ b/debian/bird2.postinst @@ -9,11 +9,9 @@ if [ "$1" = "configure" ]; then dpkg-statoverride --list /etc/bird > /dev/null || dpkg-statoverride --update --add bird bird 0750 /etc/bird - for conf in "bird.conf"; do - ucf /usr/share/doc/bird2/examples/$conf /etc/bird/$conf - ucfr -f bird2 /etc/bird/$conf - dpkg-statoverride --list /etc/bird/$conf > /dev/null || dpkg-statoverride --update --add bird bird 0640 /etc/bird/$conf - done + 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 2bdb47ef..ab03e6e6 100644 --- a/debian/bird2.postrm +++ b/debian/bird2.postrm @@ -4,7 +4,7 @@ set -e if test "$1" = "purge"; then # Check if there is no collision of ownership of /etc/bird/bird.conf - if ! which ucf ucfr >/dev/null || ucfr bird2 /etc/bird/bird.conf 2>/dev/null; then + 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 @@ -12,7 +12,7 @@ if test "$1" = "purge"; then rm -f /etc/bird/bird.conf$ext done rm -f /etc/bird/bird.conf - if which ucf ucfr >/dev/null; then + if command -v ucf ucfr >/dev/null; then ucf --purge /etc/bird/bird.conf ucfr --purge bird2 /etc/bird/bird.conf fi |