summaryrefslogtreecommitdiffstats
path: root/initramfs/initrd-stuff/init
diff options
context:
space:
mode:
authorDirk von Suchodoletz2007-03-20 15:49:13 +0100
committerDirk von Suchodoletz2007-03-20 15:49:13 +0100
commit934d1c3e3d45c0d881af566a106377beaa36182f (patch)
tree29636c0c61c3672ca46c8db6021868a2aa6e8ddb /initramfs/initrd-stuff/init
parent* oops: fixed stupid naming problems (instead of ...-x86_64 we have to use ..... (diff)
downloadcore-934d1c3e3d45c0d881af566a106377beaa36182f.tar.gz
core-934d1c3e3d45c0d881af566a106377beaa36182f.tar.xz
core-934d1c3e3d45c0d881af566a106377beaa36182f.zip
Fix for mkdxsinitrd (skip strip) ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@787 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/init')
-rwxr-xr-xinitramfs/initrd-stuff/init7
1 files changed, 4 insertions, 3 deletions
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index 5b7a3f4b..0059f9cf 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -625,8 +625,9 @@ postinit
[ $DEBUGLEVEL -gt 2 -a $DEBUGLEVEL != 8 ] && /bin/sh
# unmount the bind mounted modules directory
-for i in 0 200 300 500 800 1000 1200 2000 5000 ; do
- usleep $i && umount -n /lib/modules/${KERNEL} 2>/dev/null && break
+export ticks
+for ticks in 0 200 300 500 800 1000 1200 2000 5000 ; do
+ usleep $ticks && umount -n /lib/modules/${KERNEL} 2>/dev/null && break
error "$init_wait" nonfatal
done
@@ -653,7 +654,7 @@ killall -9 udevd hwautocfg servconfig 2>/mnt/dev/null
[ -f /tmp/watchdogpid ] && kill $(cat /tmp/watchdogpid) 2>/mnt/dev/null
umount -n /proc
# unset old environment variables
-unset debug date initrd ip dnbdroot nbdroot nfsroot vci vga
+unset debug date initrd ip dnbdroot nbdroot nfsroot ticks vci vga
unset BOOT_IMAGE KCMDLINE KERNEL MODPRV NWMODULES OLDPWD UDEVD_EVENT_TIMEOUT \
UDEVD_EXPECTED_SEQNUM PATH
# new style of pivoting (switch_root or run-init in klibc)