[arch-commits] CVS update of core/base/initscripts (rc.conf rc.sysinit)

[Tobias Powalowski]

    Date: Thursday, October 18, 2007 @ 12:50:26
  Author: tpowa
    Path: /home/cvs-core/core/base/initscripts

Modified: rc.conf (1.38 -> 1.39) rc.sysinit (1.110 -> 1.111)

'upgpkg: added loopbackhardcoded to rc.sysinit and remove it from rc.conf'


------------+
 rc.conf    |    8 +++-----
 rc.sysinit |   16 ++++++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)


Index: core/base/initscripts/rc.conf
diff -u core/base/initscripts/rc.conf:1.38 core/base/initscripts/rc.conf:1.39
--- core/base/initscripts/rc.conf:1.38	Thu Oct 18 04:43:28 2007
+++ core/base/initscripts/rc.conf	Thu Oct 18 12:50:26 2007
@@ -54,15 +54,13 @@
 # Declare each interface then list in INTERFACES
 #   - prefix an entry in INTERFACES with a ! to disable it
 #   - no hyphens in your interface names - Bash doesn't like it
-# Don't disable lo, localhost (bound to lo by default) is often used for
-# interprocess communication.
-# Don't use this for wireless interfaces, see network profiles below
 #
 # Note: to use DHCP, set your interface to be "dhcp" (eth0="dhcp")
 #
-lo="lo 127.0.0.1"
+# Don't use this for wireless interfaces, see network profiles below
+#
 eth0="eth0 192.168.0.2 netmask 255.255.255.0 broadcast 192.168.0.255"
-INTERFACES=(lo eth0)
+INTERFACES=(eth0)
 #
 # Routes to start at boot-up (in this order)
 # Declare each route then list in ROUTES
Index: core/base/initscripts/rc.sysinit
diff -u core/base/initscripts/rc.sysinit:1.110 core/base/initscripts/rc.sysinit:1.111
--- core/base/initscripts/rc.sysinit:1.110	Thu Oct 18 04:43:28 2007
+++ core/base/initscripts/rc.sysinit	Thu Oct 18 12:50:26 2007
@@ -33,6 +33,14 @@
 /sbin/modprobe usbcore >/dev/null 2>&1
 grep -qw usbfs /proc/filesystems && mount -n -t usbfs none /proc/bus/usb
 
+stat_busy "Bringing up loopback interface"
+ifconfig lo 127.0.0.1 up
+if [ $? -ne 0 ]; then
+  stat_fail
+else
+  stat_done
+fi
+
 if [ -x /etc/start_udev -a -d /sys/block ]; then
 	# We have a start_udev script and /sys appears to be mounted, use UDev
 	status "Starting UDev Daemon" /etc/start_udev init
@@ -77,6 +85,14 @@
 	status "Loading UDev uevents" /etc/start_udev uevents
 fi
 
+stat_busy "Bringing up loopback interface"
+ifconfig lo 127.0.0.1 up
+if [ $? -ne 0 ]; then
+  stat_fail
+else
+  stat_done
+fi
+
 # If using an encrypted root fs, we should find the root dev in the initrd
 # FIXME: obsoleted by initramfs and udev
 if [ -e /initrd/dev/mapper/root ]; then