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

(-)dhcpd-def (-5 / +26 lines)
Lines 26-31 Link Here
26
DHCPD_CONF=/etc/dhcp/dhcpd.conf
26
DHCPD_CONF=/etc/dhcp/dhcpd.conf
27
DHCPD_CONF_SAMPLE=/etc/dhcp/dhcpd.conf.sample
27
DHCPD_CONF_SAMPLE=/etc/dhcp/dhcpd.conf.sample
28
LOCKFILE=/var/lock/subsys/dhcpd
28
LOCKFILE=/var/lock/subsys/dhcpd
29
PROCESSNAME=dhcpd
29
30
30
# Source config.
31
# Source config.
31
SourceIfNotEmpty /etc/sysconfig/dhcpd
32
SourceIfNotEmpty /etc/sysconfig/dhcpd
Lines 36-45 Link Here
36
{
37
{
37
	is_yes "$NETWORKING" || return 0
38
	is_yes "$NETWORKING" || return 0
38
	if [ -e "$DHCPD_CONF" ]; then
39
	if [ -e "$DHCPD_CONF" ]; then
39
		start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user dhcpd -- dhcpd $DHCPDARGS
40
		start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user dhcpd -- $PROCESSNAME $DHCPDARGS
40
		RETVAL=$?
41
		RETVAL=$?
41
	else
42
	else
42
		msg_starting dhcpd
43
		msg_starting $PROCESSNAME
43
		printf "%s: %s" "$DHCPD_CONF" "No such file or directory"
44
		printf "%s: %s" "$DHCPD_CONF" "No such file or directory"
44
		failure "dhcpd startup"
45
		failure "dhcpd startup"
45
		echo
46
		echo
Lines 53-59 Link Here
53
54
54
stop()
55
stop()
55
{
56
{
56
	stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user dhcpd -- dhcpd
57
	stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user dhcpd -- $PROCESSNAME
57
	RETVAL=$?
58
	RETVAL=$?
58
	return $RETVAL
59
	return $RETVAL
59
}
60
}
Lines 61-72 Link Here
61
restart()
62
restart()
62
{
63
{
63
	stop
64
	stop
65
	conftest $PROCESSNAME
64
	start
66
	start
65
}
67
}
66
68
69
conftest()
70
{
71
        echo -n "Checking configuration sanity for $PROCESSNAME: "
72
	DAEMON_BIN="$(absolute "$1")" 
73
        $DAEMON_BIN -q -t -cf $DHCPD_CONF
74
        if [ $? -ne 0 ]; then
75
	    echo_failure
76
	    echo
77
    	    $DAEMON_BIN -t -cf $DHCPD_CONF
78
        else
79
		echo_success
80
		echo
81
	fi
82
}
83
67
# See how we were called.
84
# See how we were called.
68
case "$1" in
85
case "$1" in
69
	start)
86
	start)
87
		conftest $PROCESSNAME 
70
		start
88
		start
71
		;;
89
		;;
72
	stop)
90
	stop)
Lines 86-96 Link Here
86
		fi
104
		fi
87
		;;
105
		;;
88
	status)
106
	status)
89
		status --pidfile "$PIDFILE" --expect-user dhcpd -- dhcpd
107
		status --pidfile "$PIDFILE" --expect-user dhcpd -- $PROCESSNAME
90
		RETVAL=$?
108
		RETVAL=$?
91
		;;
109
		;;
110
	configtest)
111
	        conftest $PROCESSNAME
112
		;;
92
	*)
113
	*)
93
		msg_usage "${0##*/} {start|stop|restart|condstop|condrestart|status}"
114
		msg_usage "${0##*/} {start|stop|restart|condstop|condrestart|status|configtest}"
94
		RETVAL=1
115
		RETVAL=1
95
esac
116
esac
96
117

Return to bug 3488