[Midnightbsd-cvs] src: dhclient: Modify dhclient to use background var

[laffer1 at midnightbsd.org]

Log Message:
-----------
Modify dhclient to use background var

Modified Files:
--------------
    src/etc/rc.d:
        dhclient (r1.3 -> r1.4)

-------------- next part --------------
Index: dhclient
===================================================================
RCS file: /home/cvs/src/etc/rc.d/dhclient,v
retrieving revision 1.3
retrieving revision 1.4
diff -L etc/rc.d/dhclient -L etc/rc.d/dhclient -u -r1.3 -r1.4
--- etc/rc.d/dhclient
+++ etc/rc.d/dhclient
@@ -18,15 +18,22 @@
 
 dhclient_start()
 {
-	# prevent unnecessicary restarts
-	# XXX: should use a pidfile
-	if [ -x /usr/bin/pgrep ]; then
-		pids=`/usr/bin/pgrep -f "dhclient: $ifn(\$| .*)"`
+	# prevent unnecessary restarts
+	# XXX: dhclient had better create a pidfile
+	if [ -x /bin/pgrep ]; then
+		pids=`/bin/pgrep -f "dhclient: $ifn(\$| .*)"`
 		if [ -n "$pids" ]; then
 			exit 0
 		fi
 	fi
 
+	# Override for $ifn specific flags (see rc.subr for $flags setting)
+	specific=`get_if_var $ifn dhclient_flags_IF`
+	if [ -z "$flags" -a -n "$specific" ]; then
+		rc_flags=$specific
+	fi
+
+	background_dhclient=`get_if_var $ifn background_dhclient_IF $background_dhclient`
 	if checkyesno background_dhclient; then
 		rc_flags="${rc_flags} -b"
 	fi
@@ -42,6 +49,7 @@
 ifn="$2"
 
 load_rc_config $name
+load_rc_config network
 
 if ! dhcpif $ifn; then
 	return 1