Changeset ad29fe9 in bootscripts-standard

Timestamp:

Feb 3, 2009, 12:23:22 PM (16 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

master

Children:

04bc108

Parents:

a3d8ed8

Message:

DHCPCD Update

Files:

• Changelog (modified) (1 diff)
• cblfs/sysconfig/network-devices/services/dhcpcd (modified) (4 diffs)

Changelog

@@ +1 @@
+jim - February 3, 2009
+        * Updated DHCPCD service.
+
 jim - February 2, 2009
         * Fixed Makefile

cblfs/sysconfig/network-devices/services/dhcpcd

@@ -6 +6 @@
 # Adapted for dhcpcd by DJ Lucas <dj@lucasit.com>
 
-#$LastChangedBy$
-#$Date$
-
 . /etc/sysconfig/rc
 . $rc_functions
@@ -14 +11 @@
 
 pidfile="/var/run/dhcpcd-$1.pid"
-leaseinfo="/var/lib/dhcpcd/dhcpcd-$1.info"
 
 case "$2" in
         up)
-                boot_mesg -n "Starting dhcpcd on the $1 interface..."
+                boot_mesg -n "Starting DHCPCD on the $1 interface..."
                 # Test to see if there is a stale pid file
                 if [ -f "$pidfile" ]; then
@@ -33 +29 @@
                 # Save the return value
                 RET="$?"
-                # Print the assigned settings if requested
-                if [ "$RET" = "0" -a "$PRINTIP" = "yes" ]; then
-                        . $leaseinfo
-                        if [ "$PRINTALL" = "yes" ]; then
-                                echo ""
-                                echo_ok
-                                boot_mesg "           DHCP Assigned Settings for $1:"
-                                boot_mesg_flush
-                                boot_mesg "           IP Address:      $IPADDR"
-                                boot_mesg_flush
-                                boot_mesg "           Subnet Mask:     $NETMASK"
-                                boot_mesg_flush
-                                boot_mesg "           Default Gateway: $GATEWAYS"
-                                boot_mesg_flush
-                                boot_mesg "           DNS Server:      $DNSSERVERS"
-                                boot_mesg_flush
-                        else
-                                boot_mesg " IP Addresss: $IPADDR"
-                                echo_ok
-                        fi
-                else
-                        echo ""
-                        $(exit "$RET")
-                        evaluate_retval
-                fi
+                echo ""
+                $(exit "$RET")
+                evaluate_retval
         ;;
 
         down)
-                boot_mesg -n "Stopping dhcpcd on the $1 interface..."
+                boot_mesg -n "Stopping DHCPCD on the $1 interface..."
                 if [ -z "$DHCP_STOP" ]; then
                         echo ""
@@ -88 +62 @@
 
 # End $network_devices/services/dhcpcd
-