- Updated to ISC DHCP 4.1.1, the current 4.x series production

release, providing DHCPv6 client/server/relay implementation.
  The programs act in DHCPv6 mode, when the -6 start option is set.
  We install separate init scripts with a 6 at the end to handle
  them, that is /etc/init.d/dhcpd6 and dhrelay6. Further, there is
  also a link to the binaries with a 6 at the end, e.g. dhclient6,
  making it visible, that the installed version supports DHCPv6.
- Moved additional documentation to a separate dhcp-doc package.
- Changed to provide config files and scripts as source files
  instead of patches to the ISC scripts.
- Adopted spec file and config/scripts, merged in all patches.
- Implemented RFC 3442 classless static routes support in the
  dhclient-script (bnc#555870).

OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=15

rc.dhcrelay

@@ -2,8 +2,10 @@
 # Copyright (c) 1996, 1997, 1998 S.u.S.E. GmbH
 # Copyright (c) 1998, 1999, 2000, 2001 SuSE GmbH
 # Copyright (c) 2002 SuSE Linux AG
+# Copyright (c) 2003-2010 SUSE LINUX Products GmbH
 #
 # Author: Peter Poeml <poeml@suse.de>, 2001
+#         Marius Tomaschewski <mt@suse.de>, 2010
 #
 # /etc/init.d/dhcrelay
 #   and its symbolic link
@@ -18,23 +20,23 @@
 # Default-Start:		3 5
 # Default-Stop:			0 1 2 6
 # Short-Description:		DHCP Relay
-# Description:			Start DHCP (Dynamic Host Configuration Protocol) 
-#				gateway, relaying DHCP requests from one
-#				physical network segment to another. 
+# Description:                  Start DHCP (Dynamic Host Configuration Protocol) 
+#                               relay agent, forwarding DHCP requests from one
+#                               physical network segment to another. 
 ### END INIT INFO
 
-
-test -s /etc/sysconfig/dhcrelay && \
-      . /etc/sysconfig/dhcrelay
-
-DAEMON="dhcp relay agent"
+DAEMON="ISC DHCPv4 relay agent"
 DAEMON_BIN=/usr/sbin/dhcrelay
 DAEMON_CONF=/etc/sysconfig/dhcrelay
 DAEMON_PIDFILE=/var/run/dhcrelay.pid
 STARTPROC_LOGFILE=/var/log/rc.dhcrelay.log
 SUPPORTS_HUP="no"
 
-test -x $DAEMON_BIN || exit 5
+test -s "$DAEMON_CONF" && "$DAEMON_CONF"
+test -x $DAEMON_BIN    || {
+	echo >&2 "$0: \"$DAEMON_BIN\" is not executable."
+	test "x$1" = xstop && exit 0 || exit 5
+}
 
 # Shell functions sourced from /etc/rc.status:
 #      rc_check         check and set local and overall rc status