isc-dhcp: Fix logic to detect if the config file is unchanged
authorPhilip Prindeville <redacted>
Wed, 9 Nov 2022 03:24:41 +0000 (20:24 -0700)
committerPhilip Prindeville <redacted>
Wed, 9 Nov 2022 03:24:41 +0000 (20:24 -0700)
Thanks for Jaymin Patel for pointing the broken logic out.

Signed-off-by: Philip Prindeville <redacted>
net/isc-dhcp/files/dhcpd.init

index e72cb3797704d0d1dff25839b9365a1a65c3870a..94bdfea874634718722937c4563f9e067a7de39a 100755 (executable)
@@ -466,8 +466,6 @@ general_config() {
                local need_reload=
 
                cp -p $conf_local_file ${conf_local_file}_
-               cmp -s $conf_local_file ${conf_local_file}_ || need_reload=1
-               rm -f ${conf_local_file}_
 
                cat <<EOF > $conf_local_file
 zone "$domain" {
@@ -494,6 +492,9 @@ zone "$mynet.in-addr.arpa" {
 EOF
                done
 
+               cmp -s $conf_local_file ${conf_local_file}_ || need_reload=1
+               rm -f ${conf_local_file}_
+
                [ -n "$need_reload" ] && /etc/init.d/named reload
                sleep 1
 
git clone https://git.99rst.org/PROJECT