Changeset 1d02f01 in bootscripts-standard for cblfs

Timestamp:

Oct 23, 2007, 1:07:58 AM (17 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

master

Children:

1680407

Parents:

d8a3177

Message:

Merged Updates from BLFS/LFS SVNs

Location:

cblfs/sysconfig/network-devices/services

Files:

• dhclient (modified) (2 diffs)
• dhcpcd (modified) (6 diffs)

cblfs/sysconfig/network-devices/services/dhclient

@@ -16 +16 @@
 {
         # Print the last 16 lines of dhclient.leases
-        sed -e :a -e '$q;N;17,$D;ba' /var/state/dhcp//dhclient.leases
+        sed -e :a -e '$q;N;17,$D;ba' /var/state/dhcp/dhclient.leases
 }
 
@@ -67 +67 @@
         down)
                 boot_mesg "Stoping dhclient on the $1 interface..."
-                if [ "$DHCP_STOP" = "" ]
-                then
+                if [ "$DHCP_STOP" = "" ]; then
                         # This breaks multiple interfaces please provide
                         # the correct stop arguments.

cblfs/sysconfig/network-devices/services/dhcpcd

@@ -6 +6 @@
 # Adapted for dhcpcd by DJ Lucas <dj@lucasit.com>
 
-#$LastChangedBy: dj $
-#$Date: 2007-08-21 23:09:21 -0500 (Tue, 21 Aug 2007) $
+#$LastChangedBy$
+#$Date$
 
 . /etc/sysconfig/rc
@@ -13 +13 @@
 . $IFCONFIG
 
-PIDFILE="/var/run/dhcpcd-$1.pid"
-LEASEINFO="/var/lib/dhcpcd/dhcpcd-$1.info"
+pidfile="/var/run/dhcpcd-$1.pid"
+leaseinfo="/var/lib/dhcpcd/dhcpcd-$1.info"
 
 case "$2" in
@@ -20 +20 @@
                 boot_mesg -n "Starting dhcpcd on the $1 interface..."
                 # Test to see if there is a stale pid file
-                if [ -f "$PIDFILE" ]
-                then
-                        ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
-                        if [ $? != 0 ]
-                        then
-                                rm -f $PIDFILE > /dev/null
+                if [ -f "$pidfile" ]; then
+                        ps `cat "$pidfile"` | grep dhcpcd > /dev/null
+                        if [ $? != 0 ]; then
+                                rm -f $pidfile > /dev/null
                         else
                                 boot_mesg "dhcpcd already running!" ${WARNING}
@@ -37 +35 @@
                 # Print the assigned settings if requested
                 if [ "$RET" = "0" -a "$PRINTIP" = "yes" ]; then
-                        . $LEASEINFO
+                        . $leaseinfo
                         if [ "$PRINTALL" = "yes" ]; then
                                 echo ""
@@ -64 +62 @@
         down)
                 boot_mesg -n "Stopping dhcpcd on the $1 interface..."
-                if [ -z "$DHCP_STOP" ]
-                then
+                if [ -z "$DHCP_STOP" ]; then
                         echo ""
-                        killproc -p "$PIDFILE" /sbin/dhcpcd
+                        killproc -p "$pidfile" /sbin/dhcpcd
                 else
                         /sbin/dhcpcd $1 $DHCP_STOP &> /dev/null
@@ -91 +88 @@
 
 # End $network_devices/services/dhcpcd
+