Author: dj
Date: 2007-08-21 22:09:21 -0600 (Tue, 21 Aug 2007)
New Revision: 7092
Modified:
trunk/bootscripts/ChangeLog
trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd
Log:
Updated dhcpcd service script.
Modified: trunk/bootscripts/ChangeLog
===================================================================
--- trunk/bootscripts/ChangeLog 2007-08-21 21:27:10 UTC (rev 7091)
+++ trunk/bootscripts/ChangeLog 2007-08-22 04:09:21 UTC (rev 7092)
@@ -1,3 +1,6 @@
+2007-08-22 DJ Lucas <[EMAIL PROTECTED]>
+ * Updated the dhcpcd service script to comply with dhcpcd-3.0.19+.
+
2007-07-09 Dan Nicholson <[EMAIL PROTECTED]>
* Updated the D-Bus bootscript to call dbus-uuidgen on start and
use the system pid file.
Modified: trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd
===================================================================
--- trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd
2007-08-21 21:27:10 UTC (rev 7091)
+++ trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd
2007-08-22 04:09:21 UTC (rev 7092)
@@ -46,12 +46,12 @@
boot_mesg_flush
boot_mesg " Subnet Mask: $NETMASK"
boot_mesg_flush
- boot_mesg " Default Gateway: $GATEWAY"
+ boot_mesg " Default Gateway:
$GATEWAYS"
boot_mesg_flush
- boot_mesg " DNS Server: $DNS"
+ boot_mesg " DNS Server:
$DNSSERVERS"
boot_mesg_flush
else
- boot_mesg " IP Addresss: ""$IPADDR"
+ boot_mesg " IP Addresss: $IPADDR"
echo_ok
fi
else
@@ -63,43 +63,23 @@
down)
boot_mesg -n "Stopping dhcpcd on the $1 interface..."
- # Do nothing with the client daemon if we have an infinate
- # lease time as the client exits when started in this case,
- # just echo OK.
- if [ -e $LEASEINFO ]
+ if [ -z "$DHCP_STOP" ]
then
- . $LEASEINFO
-
- if [ "$LEASETIME" = "4294967295" ]
- then
- # do nothing, just echo ok
+ echo ""
+ killproc -p "$PIDFILE" /sbin/dhcpcd
+ else
+ /sbin/dhcpcd $1 $DHCP_STOP &> /dev/null
+ RET="$?"
+ if [ "$RET" -eq 0 ]; then
echo ""
echo_ok
+ elif [ "$RET" -eq 1 ]; then
+ boot_mesg "dhcpcd not running!" ${WARNING}
+ echo_warning
else
- if [ -n "$DHCP_STOP" ]
- then
- /sbin/dhcpcd $1 $DHCP_STOP &> /dev/null
- RET="$?"
- if [ "$RET" -eq 0 ]; then
- echo ""
- echo_ok
- elif [ "$RET" -eq 1 ]; then
- boot_mesg "dhcpcd not running!"
${WARNING}
- echo_warning
- else
- echo ""
- echo_failure
- fi
- else
echo ""
- killproc dhcpcd
+ echo_failure
fi
- fi
- else
- boot_mesg -n "LEASEINFO Test failed! - " ${WARNING}
- boot_mesg "dhcpcd is not running!" ${WARNING}
- echo_warning
- exit 1
fi
;;
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
