summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-05-09 17:24:23 +0200
committertnut <thierryn1 at hispeed dot ch>2010-05-09 17:24:23 +0200
commit4d0283221194079552fee6628352fb3824caff5c (patch)
tree3b61f88097653f06395faffc6843201d21adc2c7 /base
parent25b3b763e5f74b0336c489856a14bd047ad98a6c (diff)
downloadnutyx-extra-4d0283221194079552fee6628352fb3824caff5c.tar.gz
nutyx-extra-4d0283221194079552fee6628352fb3824caff5c.tar.bz2
nutyx-extra-4d0283221194079552fee6628352fb3824caff5c.tar.xz
nutyx-extra-4d0283221194079552fee6628352fb3824caff5c.zip
maj aaabasicfs#2010-beta4, script network amélioré
Diffstat (limited to 'base')
-rw-r--r--base/aaabasicfs/Pkgfile2
-rwxr-xr-xbase/aaabasicfs/network14
2 files changed, 13 insertions, 3 deletions
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