- Implemented optional ldap connect retry loop during the initial

startup of the dhcp server in cases where the ldap server is not
  yet started. Set the ldap-init-retry <num> option in dhcpd.conf
  to enable it (bnc#627617). Merged in the actual ldap patch.
- Cleaned up init script error reporting, no -TERM for killproc.

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

rc.dhcrelay6

@@ -113,16 +113,12 @@ case "$1" in
 	# already running to match LSB spec.
 	test "$2" = "-v" && echo -en \
 		"\nexecuting '$DAEMON_BIN $DHCPv_OPT $DHCRELAY6_OPTIONS $DHCRELAY6_LOWER_INTERFACES_ARGS $DHCRELAY6_UPPER_INTERFACES_ARGS'"
-	startproc -q -l $STARTPROC_LOGFILE -p $DAEMON_PIDFILE $DAEMON_BIN $DHCPv_OPT $DHCRELAY6_OPTIONS $DHCRELAY6_LOWER_INTERFACES_ARGS $DHCRELAY6_UPPER_INTERFACES_ARGS
+	startproc -q -l $STARTPROC_LOGFILE -p $DAEMON_PIDFILE $DAEMON_BIN $DHCPv_OPT $DHCRELAY6_OPTIONS $DHCRELAY6_LOWER_INTERFACES_ARGS $DHCRELAY6_UPPER_INTERFACES_ARGS &>/dev/null
 	rc=$?
 	if ! [ $rc -eq 0 ]; then
-		if [ $link = $base ] ; then
-			## be quiet
-			cat $STARTPROC_LOGFILE
-		else
-			## be verbose
-			echo -e -n "  please see $STARTPROC_LOGFILE for details ";
-		fi
+		## be verbose
+		echo ""
+		echo -n "  please see $STARTPROC_LOGFILE for details ";
 		## set status to failed
 		rc_failed
 	fi
@@ -135,7 +131,7 @@ case "$1" in
 	## Stop daemon with killproc(8) and if this fails
 	## set echo the echo return value.
 
-	killproc -p $DAEMON_PIDFILE -TERM $DAEMON_BIN 
+	killproc -p $DAEMON_PIDFILE $DAEMON_BIN 
 
 	# Remember status and be verbose
 	rc_status -v