View | Details | Raw Unified | Return to bug 133072
Collapse All | Expand All

(-)b/net/isc-dhcp30-server/files/isc-dhcpd.in (+20 lines)
Lines 701-706 dhcpd_uninstall () Link Here
701
	fi
701
	fi
702
}
702
}
703
703
704
dhcpd_checkconfig ()
705
{
706
	local rc_flags_saved rc_flags_our
707
	rc_flags_saved="$rc_flags"
708
	setup_flags
709
	# Eliminate '-q' flag if it is present
710
	rc_flags_our=`echo "${rc_flags}" | sed -Ee's/(^-q | -q | -q$)'//`
711
	rc_flags="${rc_flags_saved}"
712
	if ${command} -t -q ${rc_flags_our}; then
713
		true
714
	else
715
		echo "Configuration file sanity check failed:"
716
		echo "======================================="
717
		${command} -t ${rc_flags_our}
718
		echo "======================================="
719
		false
720
	fi
721
}
722
704
rcvar=${name}_enable
723
rcvar=${name}_enable
705
load_rc_config ${name}
724
load_rc_config ${name}
706
725
Lines 719-724 pidfile=${_dhcpd_pidfile} Link Here
719
required_files=${dhcpd_conf}
738
required_files=${dhcpd_conf}
720
start_precmd=${name}_precmd
739
start_precmd=${name}_precmd
721
stop_postcmd=${name}_postcmd
740
stop_postcmd=${name}_postcmd
741
restart_precmd="dhcpd_checkconfig"
722
install_cmd=dhcpd_install
742
install_cmd=dhcpd_install
723
uninstall_cmd=dhcpd_uninstall
743
uninstall_cmd=dhcpd_uninstall
724
extra_commands="install uninstall"
744
extra_commands="install uninstall"
(-)b/net/isc-dhcp31-server/files/isc-dhcpd.in (-1 / +20 lines)
Lines 700-705 dhcpd_uninstall () Link Here
700
	fi
700
	fi
701
}
701
}
702
702
703
dhcpd_checkconfig ()
704
{
705
	local rc_flags_saved rc_flags_our
706
	rc_flags_saved="$rc_flags"
707
	setup_flags
708
	# Eliminate '-q' flag if it is present
709
	rc_flags_our=`echo "${rc_flags}" | sed -Ee's/(^-q | -q | -q$)'//`
710
	rc_flags="${rc_flags_saved}"
711
	if ${command} -t -q ${rc_flags_our}; then
712
		true
713
	else
714
		echo "Configuration file sanity check failed:"
715
		echo "======================================="
716
		${command} -t ${rc_flags_our}
717
		echo "======================================="
718
		false
719
	fi
720
}
721
703
rcvar=${name}_enable
722
rcvar=${name}_enable
704
load_rc_config ${name}
723
load_rc_config ${name}
705
724
Lines 718-723 pidfile=${_dhcpd_pidfile} Link Here
718
required_files=${dhcpd_conf}
737
required_files=${dhcpd_conf}
719
start_precmd=${name}_precmd
738
start_precmd=${name}_precmd
720
stop_postcmd=${name}_postcmd
739
stop_postcmd=${name}_postcmd
740
restart_precmd="dhcpd_checkconfig"
721
install_cmd=dhcpd_install
741
install_cmd=dhcpd_install
722
uninstall_cmd=dhcpd_uninstall
742
uninstall_cmd=dhcpd_uninstall
723
extra_commands="install uninstall"
743
extra_commands="install uninstall"
724
- 

Return to bug 133072