aaabasicfs, maj 2011-2

4 files changed, 68 insertions, 26 deletions

diff --git a/base/aaabasicfs/.md5sum.i686 b/base/aaabasicfs/.md5sum.i686
index 3219f4255..a9d19f71f 100644
--- a/base/aaabasicfs/.md5sum.i686
+++ b/base/aaabasicfs/.md5sum.i686
@@ -2,7 +2,7 @@
 61ba4859757a54bf1f514de5213802e0  bash_profile
 f29eb765bd7c24471d055cc72b0edd4e  bashrc
 3974f1b4242908346f309b096a7a6ed6  bashrc.etc
-deb0289f1ce9bac5cfd09c869648a6d3  blfs-bootscripts-20100825.tar.bz2
+8026923cf29639bf6ac5a2b77bec74dc  blfs-bootscripts-20100825.tar.bz2
 248d4faa838949085a51003b2c0c3f00  dircolors.sh
 ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 64514eb39b4878f060065cab28191ee5  fstab
@@ -10,7 +10,7 @@ ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 2ca09cd10bcc4f6adb0c5b1521bfdb7e  inputrc
 f05a15125a4c6008471d96b096445e21  lfs-bootscripts-03.patch
 5041ee97992e3f10d3be44f46a6aeb76  lfs-bootscripts-20110424.tar.bz2
-6bd38769ed6f5df86e8046b68326f7f4  network
+5db66298e38962c9764911bb37b41f51  network
 4f193837349d63e6c98501f221904170  nu
 210fdabd07248f79617508807715167b  profile
 b860cf492e983f400666fa43c00f2954  rc
diff --git a/base/aaabasicfs/.md5sum.x86_64 b/base/aaabasicfs/.md5sum.x86_64
index 3219f4255..a9d19f71f 100644
--- a/base/aaabasicfs/.md5sum.x86_64
+++ b/base/aaabasicfs/.md5sum.x86_64
@@ -2,7 +2,7 @@
 61ba4859757a54bf1f514de5213802e0  bash_profile
 f29eb765bd7c24471d055cc72b0edd4e  bashrc
 3974f1b4242908346f309b096a7a6ed6  bashrc.etc
-deb0289f1ce9bac5cfd09c869648a6d3  blfs-bootscripts-20100825.tar.bz2
+8026923cf29639bf6ac5a2b77bec74dc  blfs-bootscripts-20100825.tar.bz2
 248d4faa838949085a51003b2c0c3f00  dircolors.sh
 ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 64514eb39b4878f060065cab28191ee5  fstab
@@ -10,7 +10,7 @@ ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 2ca09cd10bcc4f6adb0c5b1521bfdb7e  inputrc
 f05a15125a4c6008471d96b096445e21  lfs-bootscripts-03.patch
 5041ee97992e3f10d3be44f46a6aeb76  lfs-bootscripts-20110424.tar.bz2
-6bd38769ed6f5df86e8046b68326f7f4  network
+5db66298e38962c9764911bb37b41f51  network
 4f193837349d63e6c98501f221904170  nu
 210fdabd07248f79617508807715167b  profile
 b860cf492e983f400666fa43c00f2954  rc
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index cfc75eea1..51efed108 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -5,14 +5,15 @@
 
 name=aaabasicfs
 version=2011
-release=1
+release=2
 scriptsversion=lfs-bootscripts-20110424
 BLFSscriptsversion=20100825
 XORG_PREFIX=/usr
-source=(http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2 \
- http://www.linuxfromscratch.org/blfs/downloads/svn/blfs-bootscripts-$BLFSscriptsversion.tar.bz2 \
- fstab inittab inputrc network rc profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc \
- http://nutyx.meticul.eu/files/patchs/$name/lfs-bootscripts-03.patch nu readline.sh unmask.sh X.sh )
+source=(http://nutyx.meticul.eu/files/patchs/$name/$scriptsversion.tar.bz2 \
+        http://nutyx.meticul.eu/files/patchs/$name/blfs-bootscripts-$BLFSscriptsversion.tar.bz2 \
+	http://nutyx.meticul.eu/files/patchs/$name/lfs-bootscripts-03.patch \
+        fstab inittab inputrc network rc profile dircolors.sh extrapaths.sh \
+	bash_profile bashrc bashrc.etc nu readline.sh unmask.sh X.sh )
 
 
 build() {
diff --git a/base/aaabasicfs/network b/base/aaabasicfs/network
index ff268b03b..9793632b3 100755
--- a/base/aaabasicfs/network
+++ b/base/aaabasicfs/network
@@ -6,22 +6,46 @@
 
 . /etc/sysconfig/rc
 . $rc_functions
-let TIME=30
+
+# Network configuration
+. /etc/sysconfig/network
+
+NM_PIDFILE=/var/run/NetworkManager.pid
+WICD_PIDFILE=
+
+let TIME=$NETWORKDELAY
 case "$1" in
 	start)
-		if [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then
+		if [ "$MANAGER" == "networkmanager" ] && [ -x /usr/sbin/NetworkManager ]; then
+			boot_mesg "Setting network parameters... "
+			sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
+			echo_ok
+
+			boot_mesg "Starting NetworkManager daemon..."
+			loadproc NetworkManager --pid-file $NM_PIDFILE
+			if [ "${NETWORKWAIT}" == "yes" ]; then 
+				[ -z "${LINKDELAY}" ] && LINKDELAY=10
+				boot_mesg "Waiting for network..."
+				nm-online -q --timeout=$LINKDELAY || nm-online -q -x --timeout=30
+				[ "$?" = "0" ] && log_success_msg "Network startup" || log_failure_msg "Network startup"
+				[ -n "${NETWORKDELAY}" ] && /bin/sleep ${NETWORKDELAY}
+			fi
+
+		elseif [ "$MANAGER" == "wicd" ] && [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then
 			boot_mesg "Starting the wicd Daemon..."
 			loadproc /usr/share/wicd/daemon/wicd-daemon.py
 				if grep -v ^# /etc/fstab | grep _netdev > /dev/null; then
-					while ! grep "nameserver" /etc/resolv.conf ; 
-						do 
-							sleep 1
-							echo -n .
-							let TIME=$TIME-1
-							if [ $TIME -lt 1 ]; then
-								boot_mesg "Time out"
-								echo_failure
-								exit 1
+					while ! grep "nameserver" /etc/resolv.conf ;
+						do
+							if [ $TIME -gt 0 ]; then
+								sleep 1
+								echo -n .
+								let TIME=$TIME-1
+								if [ $TIME -lt 1 ]; then
+									boot_mesg "Time out"
+									echo_failure
+									exit 1
+								fi
 							fi
 						done
 					boot_mesg "Network successfully configured..."
@@ -36,18 +60,35 @@ case "$1" in
 		;;
 
 	stop)
-		if [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then
-				boot_mesg "Stopping the wicd Daemon..."
-				loadproc /usr/share/wicd/daemon/wicd-daemon.py --kill
+		if [ "$MANAGER" == "networkmanager" ] && [ -x /usr/sbin/NetworkManager ]; then
+			boot_mesg "Stopping NetworkManager daemon..."
+			killproc -p $NM_PIDFILE NetworkManager
+		elif [ "$MANAGER" == "wicd" ] && [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then
+			boot_mesg "Stopping the wicd Daemon..."
+			loadproc /usr/share/wicd/daemon/wicd-daemon.py --kill
 		else
 			if  [ -f /etc/rc.d/init.d/iplink ]; then
-                                /etc/rc.d/init.d/iplink stop
-                        fi
+				/etc/rc.d/init.d/iplink stop
+			fi
+		fi
+		;;
+	status)
+		if [ "$MANAGER" == "networkmanager" ] && [ -x /usr/sbin/NetworkManager ]; then
+			statusproc -p $NM_PIDFILE NetworkManager
+		else
+			if [ "$MANAGER" == "wicd" ] && [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then
+				statusproc -p /var/run/wicd/wicd.pid "/usr/bin/python2 /usr/share/wicd/daemon/wicd-daemon.py"
+			fi
 		fi
 		;;
+	restart)
+		stop
+		sleep 3
+		start
+		;;
 
 	*)
-		echo "Usage: $0 {start|stop}"
+		echo "Usage: $0 {start|stop|restart|status}"
 		exit 1
 		;;
 esac