r6810 - in trunk/bootscripts: . blfs/sysconfig/network-devices/services

dnicholson at linuxfromscratch.org dnicholson at linuxfromscratch.org
Wed Jun 20 20:36:57 PDT 2007


Author: dnicholson
Date: 2007-06-20 21:36:57 -0600 (Wed, 20 Jun 2007)
New Revision: 6810

Modified:
   trunk/bootscripts/ChangeLog
   trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd
Log:
Fix the dhcpcd service script to reference correct pid and lease files


Modified: trunk/bootscripts/ChangeLog
===================================================================
--- trunk/bootscripts/ChangeLog	2007-06-20 13:12:13 UTC (rev 6809)
+++ trunk/bootscripts/ChangeLog	2007-06-21 03:36:57 UTC (rev 6810)
@@ -1,3 +1,7 @@
+2007-06-20 Dan Nicholson <dnicholson at linuxfromscratch.org>
+	* Use proper references for the pid and lease files in the dhcpcd
+	  service script.
+
 2006-10-11 Dan Nicholson <dnicholson at linuxfromscratch.org>
 	* Fixed gpm boot script to accept multiple arguments in the
 	  variables, particularly GPMOPTS. Thanks to Christoph Felkes

Modified: trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd
===================================================================
--- trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd	2007-06-20 13:12:13 UTC (rev 6809)
+++ trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd	2007-06-21 03:36:57 UTC (rev 6810)
@@ -24,7 +24,7 @@
 			ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
 			if [ $? != 0 ]
 			then
-				rm -f /var/run/dhcpcd-$1.pid > /dev/null
+				rm -f $PIDFILE > /dev/null
 			else
 				boot_mesg "dhcpcd already running!" ${WARNING}
 				echo_warning
@@ -36,7 +36,7 @@
 		RET="$?"
 		# Print the assigned settings if requested
 		if [ "$RET" = "0" -a "$PRINTIP" = "yes" ]; then
-			. /var/lib/dhcpc/dhcpcd-$1.info
+			. $LEASEINFO
 			if [ "$PRINTALL" = "yes" ]; then
 				echo ""
 				echo_ok




More information about the blfs-book mailing list