diff options
Diffstat (limited to 'packages/altboot/files')
| -rw-r--r-- | packages/altboot/files/altboot-menu/Advanced/40-bootNFS | 6 | ||||
| -rw-r--r-- | packages/altboot/files/altboot.func | 25 |
2 files changed, 23 insertions, 8 deletions
diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS index 9a36b8ed01..87373d8eec 100644 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS @@ -25,7 +25,7 @@ run_module() { if test -z "$nfs_host" then - die "${C_RED}No configured NFS drives found in /etc/fstab$C_RESET" + mdie "${C_RED}No configured NFS drives found in /etc/fstab$C_RESET" fi @@ -79,7 +79,7 @@ run_module() { selection="$nfs_mounts" fi - mkdir -p /media/nfsroot || die "mkdir -p /media/nfsroot failed!" + mkdir -p /media/nfsroot || mdie "mkdir -p /media/nfsroot failed!" echo -n "Mounting NFS root..." @@ -91,7 +91,7 @@ run_module() { umount /media/nfsroot || die "umount failed!" fi - mount -t nfs "$selection" /media/nfsroot && echo ok || die "mount -t nfs "$selection" /media/nfsroot failed!" + mount -t nfs "$selection" /media/nfsroot && echo ok || mdie "mount -t nfs "$selection" /media/nfsroot failed!" # Use configured resolv.conf in the pivoted rootfs #echo -n "Copying resolv.conf..." diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index 98c38b40ef..9a0b139bfb 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -686,7 +686,7 @@ start_networking() { then echo -e "\nRunning cardctl to setup networking..." /etc/init.d/pcmcia start >/dev/null 2>&1 || die "/etc/init.d/pcmcia start failed!" - sleep 1 + sleep 3 else # With kernel 2.6.16+ udev is used echo -e "\nRunning udevd to setup networking..." @@ -719,10 +719,25 @@ start_networking() { if test -z "$WLAN_NIC" then - debug_echo "WARNING: WLAN_NIC is empty!\n" - debug_echo "Filter result: [$WLAN_NIC]" - debug_echo "iwconfig: [`iwconfig`]" - mdie "No network interface found" + # cardctl needs some time.... + echo -n "Waiting for WLAN card.." + timeout=0 + while test "$timeout" -lt 10 + do + WLAN_NIC="`iwconfig 2>/dev/null | grep ESSID | grep -v wifi | awk '{print $1}'`" + test -n "$WLAN_NIC" && break + echo -n "." + let timeout=$timeout+1 + sleep 1 + done + + if test -z "$WLAN_NIC" + then + debug_echo "WARNING: WLAN_NIC is empty!\n" + debug_echo "Filter result: [$WLAN_NIC]" + debug_echo "iwconfig: [`iwconfig`]" + mdie "No network interface found" + fi fi # WLAN with DHCP needs some time to get a lease, set up the routing, etc. |