[Clfs-commits] commit: r43 - in /trunk/standard: Changelog cblfs/sysconfig/network-devices/services/dhcpcd

[svn at cross-lfs.org]

Author: jim
Date: Tue Feb  3 20:23:22 2009
New Revision: 43

Log:
DHCPCD Update

Modified:
    trunk/standard/Changelog
    trunk/standard/cblfs/sysconfig/network-devices/services/dhcpcd

Modified: trunk/standard/Changelog
==============================================================================
--- trunk/standard/Changelog (original)
+++ trunk/standard/Changelog Tue Feb  3 20:23:22 2009
@@ -1,3 +1,6 @@
+jim - February 3, 2009
+	* Updated DHCPCD service.
+
 jim - February 2, 2009
 	* Fixed Makefile
 	* Moved Network to install-network

Modified: trunk/standard/cblfs/sysconfig/network-devices/services/dhcpcd
==============================================================================
--- trunk/standard/cblfs/sysconfig/network-devices/services/dhcpcd (original)
+++ trunk/standard/cblfs/sysconfig/network-devices/services/dhcpcd Tue Feb  3 20:23:22 2009
@@ -5,19 +5,15 @@
 # Rewritten by Nathan Coulson <nathan at linuxfromscratch.org>
 # Adapted for dhcpcd by DJ Lucas <dj at lucasit.com>
 
-#$LastChangedBy$
-#$Date$
-
 . /etc/sysconfig/rc
 . $rc_functions
 . $IFCONFIG
 
 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
 			ps `cat "$pidfile"` | grep dhcpcd > /dev/null
@@ -32,35 +28,13 @@
 		/sbin/dhcpcd $1 $DHCP_START
 		# 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 ""
 			killproc -p "$pidfile" /sbin/dhcpcd
@@ -87,4 +61,3 @@
 esac
 
 # End $network_devices/services/dhcpcd
-