summaryrefslogtreecommitdiffstats
path: root/initramfs/initrd-stuff/init
diff options
context:
space:
mode:
authorDirk von Suchodoletz2007-06-01 01:22:02 +0200
committerDirk von Suchodoletz2007-06-01 01:22:02 +0200
commit8dc60037cb0a8ced933434c27a1c46c8e3cd71a2 (patch)
treefc644a36028a5b62d65c62fb2bf22cc48b757903 /initramfs/initrd-stuff/init
parentStuff for WLAN boot (all testing). (diff)
downloadcore-8dc60037cb0a8ced933434c27a1c46c8e3cd71a2.tar.gz
core-8dc60037cb0a8ced933434c27a1c46c8e3cd71a2.tar.xz
core-8dc60037cb0a8ced933434c27a1c46c8e3cd71a2.zip
Small bug which prevented the setting of default route if no PXE ip
config was available ... git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1126 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/init')
-rwxr-xr-xinitramfs/initrd-stuff/init13
1 files changed, 7 insertions, 6 deletions
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index 252eb4c0..7ac9ef3a 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -307,8 +307,8 @@ fi
hwautocfg nwmod
if [ -n "${essid}" ] ; then
wlanlinksetup
- echo "Starting shell for testing of WLAN setup procedure"
- /bin/ash
+ #echo "Starting shell for testing of WLAN setup procedure"
+ #/bin/ash
fi
# set up loopback networking
@@ -355,6 +355,7 @@ if [ -n "$noipyet" ] ; then
-o -z "$broadcast_address" ] && error "$init_errdhcp"
ip addr add $clientip/$(nm2pref $subnet_mask) broadcast $broadcast_address \
dev $nwif
+ ip route add default via $gateway
fi
# check if serverip is set as variable @@@serverip@@@
sed "s,@@@serverip@@@,$serverip," -i /etc/machine-setup
@@ -385,7 +386,7 @@ if [ -n "${nbdmod}" ] ; then
RDEV=/dev/nbd0
waitfor "${RDEV}" 20000 || error "$init_nbddev"
while ! nbd-client $nbdhost $nbdport ${RDEV} ; do
- usleep 100
+ usleep 10000
done
usleep 100
echo noop > /sys/block/nbd0/queue/scheduler
@@ -428,9 +429,9 @@ if [ -n "${nbdmod}" ] ; then
waitfor /dev/dnbd0 10000 || error "$init_nbddev"
echo "dnbd-client -b $nbdhost -d $RDEV $clientopt"
/bin/ash
- #while ! dnbd-client -b $nbdhost -d $RDEV $clientopt ; do
- # sleep 1
- #done
+ while ! dnbd-client -b $nbdhost -d $RDEV $clientopt ; do
+ usleep 10000
+ done
# problem with squashfs and cfq scheduler
echo noop > /sys/block/dnbd0/queue/scheduler
echo 0 > /sys/block/dnbd0/queue/read_ahead_kb