From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 4 Feb 2009 20:45:14 +0000 (+0100)
Subject: Added some indication in what stage we are running.
X-Git-Tag: v3.0-alpha1~33^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9549c448e95b54dcdb9c201a6b364ba1721a4ae6;p=ipfire-3.x.git

Added some indication in what stage we are running.
---

diff --git a/src/initscripts/core/network b/src/initscripts/core/network
index 5a8d62758..2cc3a0697 100644
--- a/src/initscripts/core/network
+++ b/src/initscripts/core/network
@@ -31,6 +31,7 @@ case "${1}" in
 
 			IN_BOOT=1 ${NETWORK_SCRIPTS}/brup ${interface}
 		done
+		touch /var/lock/subsys/network
 		;;
 
 	stop)
@@ -52,6 +53,7 @@ case "${1}" in
 
 			IN_BOOT=1 ${NETWORK_SCRIPTS}/brdown ${interface}
 		done
+		rm -f /var/lock/subsys/network
 		;;
 
 	restart)
diff --git a/src/initscripts/core/rc b/src/initscripts/core/rc
index 5faf1a00f..53dc48020 100644
--- a/src/initscripts/core/rc
+++ b/src/initscripts/core/rc
@@ -25,6 +25,10 @@ if [ "${prevlevel}" = "" ]; then
     prevlevel="N"
 fi
 
+if [ "${runlevel}" = "S" ]; then
+	touch /dev/.in_sysinit
+fi
+
 # Mount a tmpfs to store boot accounting information
 if [ "${runlevel}" = "S" -a "${TEMPFS_MOUNT}" != "" ]; then
     mount -n -t tmpfs tmpfs "${TEMPFS_MOUNT}" -o mode=600
@@ -178,6 +182,8 @@ do
     fi
 done
 
+rm -f /dev/.in_sysinit
+
 # Strip apply time to the logs, strip out any color codes and dump 
 # the log to /var/log/boot.log
 if [ -f "${TEMPFS_MOUNT}/.bootlog" -a "${runlevel}" != "S" ]; then
diff --git a/src/initscripts/networking/net-hotplug b/src/initscripts/networking/net-hotplug
index 23c02dc3c..a2d4cd3a4 100644
--- a/src/initscripts/networking/net-hotplug
+++ b/src/initscripts/networking/net-hotplug
@@ -29,6 +29,13 @@ MAC=$(get_mac_by_device ${INTERFACE})
 
 case $ACTION in
 	add|register)
+		# Don't do anything if the network is stopped
+		if [ -f /dev/.in_sysinit ] ; then
+			exit 0
+		fi
+		if [ ! -f /var/lock/subsys/network ]; then
+			exit 0
+		fi
 		case $INTERFACE in
 			# interfaces that are brought up as a part of configuration
 			ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*|ipsec*|tun*|tap*)