From 4d0283221194079552fee6628352fb3824caff5c Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Sun, 9 May 2010 17:24:23 +0200
Subject: maj aaabasicfs#2010-beta4, script network amélioré
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/aaabasicfs/Pkgfile |  2 +-
 base/aaabasicfs/network | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'base')

diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index f310f9dad..c21e948e6 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -6,7 +6,7 @@
 
 name=aaabasicfs
 version=2010
-release=beta-3
+release=beta-4
 scriptsversion=lfs-bootscripts-20100124
 source=(  http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2\
  hosts console fstab inittab message inputrc network \
diff --git a/base/aaabasicfs/network b/base/aaabasicfs/network
index 411f85b43..b88a42111 100755
--- a/base/aaabasicfs/network
+++ b/base/aaabasicfs/network
@@ -6,14 +6,24 @@
 
 . /etc/sysconfig/rc
 . $rc_functions
-
+let TIME=20
 case "$1" in
 	start)
 		if [ -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;done
+					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
+							fi
+						done
 					boot_mesg "Network successfully configured..."
 					echo_ok
 				fi
-- 
cgit v1.2.3-70-g09d2