diff --git a/bind.spec b/bind.spec index 1a091c4..42934f5 100644 --- a/bind.spec +++ b/bind.spec @@ -1196,12 +1196,17 @@ fi %systemd_postun_with_restart named-pkcs11.service %endif -%triggerpostun -n bind -- bind <= 32:9.5.0-20.b1 -if [ "$1" -gt 0 ]; then - [ -e /etc/rndc.key ] && chown root:named /etc/rndc.key - [ -e /etc/rndc.key ] && chmod 0640 /etc/rndc.key +# Fix permissions on existing device files on upgrade +%define chroot_fix_devices() \ +if [ $1 -gt 1 ]; then \ + for DEV in "%{1}/dev"/{null,random,zero}; do \ + if [ -e "$DEV" -a "$(/bin/stat --printf="%G %a" "$DEV")" = "root 644" ]; \ + then \ + /bin/chmod 0664 "$DEV" \ + /bin/chgrp named "$DEV" \ + fi \ + done \ fi -:; %triggerun -- bind < 32:9.9.0-0.6.rc1 /sbin/chkconfig --del named >/dev/null 2>&1 || : @@ -1222,18 +1227,6 @@ fi %end %endif -# Fix permissions on existing device files on upgrade -%define chroot_fix_devices() \ -if [ $1 -gt 1 ]; then \ - for DEV in "%{1}/dev"/{null,random,zero}; do \ - if [ -e "$DEV" -a "$(/bin/stat --printf="%G %a" "$DEV")" = "root 644" ]; \ - then \ - /bin/chmod 0664 "$DEV" \ - /bin/chgrp named "$DEV" \ - fi \ - done \ -fi - %post chroot %systemd_post named-chroot.service %chroot_fix_devices %{chroot_prefix}