Applied init script & sysconfig variable fixes
cleaned up debug build hooks OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=44
This commit is contained in:
@@ -25,6 +25,7 @@
|
||||
# physical network segment to another.
|
||||
### END INIT INFO
|
||||
|
||||
DHCPv_OPT=-4
|
||||
DAEMON="ISC DHCPv4 relay agent"
|
||||
DAEMON_BIN=/usr/sbin/dhcrelay
|
||||
DAEMON_CONF=/etc/sysconfig/dhcrelay
|
||||
@@ -79,7 +80,9 @@ rc_reset
|
||||
case "$1" in
|
||||
start)
|
||||
echo -n "Starting $DAEMON"
|
||||
checkproc $DAEMON_BIN && { echo -n "... already running"; rc_status -v; exit 0; }
|
||||
checkproc -p $DAEMON_PIDFILE $DAEMON_BIN && {
|
||||
echo -n "... already running"; rc_status -v; exit 0;
|
||||
}
|
||||
|
||||
## If interfaces or servers are not set, skip starting of dhcrelay
|
||||
## and return with "program not configured"
|
||||
@@ -100,8 +103,8 @@ case "$1" in
|
||||
# startproc should return 0, even if service is
|
||||
# already running to match LSB spec.
|
||||
test "$2" = "-v" && echo -en \
|
||||
"\nexecuting '$DAEMON_BIN $DHCRELAY_OPTIONS $DHCRELAY_INTERFACES_ARGS $DHCRELAY_SERVERS'"
|
||||
startproc -q -l $STARTPROC_LOGFILE $DAEMON_BIN $DHCRELAY_OPTIONS $DHCRELAY_INTERFACES_ARGS $DHCRELAY_SERVERS
|
||||
"\nexecuting '$DAEMON_BIN $DHCPv_OPT $DHCRELAY_OPTIONS $DHCRELAY_INTERFACES_ARGS $DHCRELAY_SERVERS'"
|
||||
startproc -q -l $STARTPROC_LOGFILE -p $DAEMON_PIDFILE $DAEMON_BIN $DHCPv_OPT $DHCRELAY_OPTIONS $DHCRELAY_INTERFACES_ARGS $DHCRELAY_SERVERS
|
||||
rc=$?
|
||||
if ! [ $rc -eq 0 ]; then
|
||||
if [ $link = $base ] ; then
|
||||
|
Reference in New Issue
Block a user