summaryrefslogtreecommitdiffstats
path: root/initramfs/initrd-stuff/init
diff options
context:
space:
mode:
authorDirk von Suchodoletz2007-07-04 16:58:30 +0200
committerDirk von Suchodoletz2007-07-04 16:58:30 +0200
commit72973602b194861cd852b39e12f9c60a02659b1b (patch)
treed8d685842dc9d496483684b3293927d469270d11 /initramfs/initrd-stuff/init
parentGentoo: removed some standard-services from config-default (can be enabled by... (diff)
downloadcore-72973602b194861cd852b39e12f9c60a02659b1b.tar.gz
core-72973602b194861cd852b39e12f9c60a02659b1b.tar.xz
core-72973602b194861cd852b39e12f9c60a02659b1b.zip
Adjusted timings a little bit (waiting for scripts like hwautocfg to
complete ...) git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1224 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/init')
-rwxr-xr-xinitramfs/initrd-stuff/init3
1 files changed, 1 insertions, 2 deletions
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index f6b25a33..160cb2c3 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -447,7 +447,6 @@ if [ -n "${nbdmod}" ] ; then
ip route add 224.0.0.0/4 dev $nwif
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
usleep 10000
done
@@ -691,7 +690,7 @@ else
error "$init_infldcfg" nonfatal
fi
# wait a while for hardware setup to complete and copy stuff to stage4
-waitfor /tmp/hwcfg 10000 || error "$init_errhw"
+waitfor /tmp/hwcfg 20000 || error "$init_errhw"
[ -f /tmp/scanner-udev ] && cat /tmp/scanner-udev \
>> /mnt/etc/udev/rules.d/04-scanner.rules
# wait for completion of Xorg configuration and finalize it