diff options
| author | Dirk von Suchodoletz | 2006-01-31 01:46:26 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-01-31 01:46:26 +0100 |
| commit | af186e4345e98db5f28227d378ef07e2ba7c4a4b (patch) | |
| tree | c12df555140bfbb424f5fab4e02a6375bfc57566 /initrd/initrd-stuff/init | |
| parent | Improved module loading within hwautocfg - put loading of ide (diff) | |
| download | core-af186e4345e98db5f28227d378ef07e2ba7c4a4b.tar.gz core-af186e4345e98db5f28227d378ef07e2ba7c4a4b.tar.xz core-af186e4345e98db5f28227d378ef07e2ba7c4a4b.zip | |
Minor improvements ...
git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@51 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/init')
| -rwxr-xr-x | initrd/initrd-stuff/init | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init index 94cb78ec..e10f52ad 100755 --- a/initrd/initrd-stuff/init +++ b/initrd/initrd-stuff/init @@ -2,13 +2,13 @@ # Description: main script for new type of initial ramdisk for # linux diskless clients version 4 # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 20-01-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 31-01-2006 # Bla # Blub # # Copyright: (c) 2006 - RZ Universitaet Freiburg # -# Version: 0.2.1a +# Version: 0.2.1b # functions common for all distros errmsg="functions file contains a lot of script \ @@ -385,9 +385,9 @@ of this client did not finish in\n time. You might check the process list \ and list the modules loaded until\n now." # IP configuration is made and should not be updated automatically, udevd # should be killed if started within init -killall -9 dhcpcd dhclient pump udevd 2>/dev/null +killall -9 dhcpcd dhclient pump 2>/dev/null # unmount the bind mounted modules directory -umount -n /lib/modules/${KERNEL} || { +umount -n /lib/modules/${KERNEL} 2>/dev/null || { usleep 40 && umount -n /lib/modules/${KERNEL} || \ error "Unmount of the kernel modules directory failed for some reason." } @@ -402,6 +402,8 @@ could not be\n removed." nonfatal umount -n /proc/bus/usb >/dev/null 2>&1 mount -n --move /dev /mnt/dev cd /mnt +# kill udevd +[ -n "${UDEVD_EXPECTED_SEQNUM}" ] && killall -9 udevd 2>/dev/null umount -n /proc [ -n "${UNIONFS}" ] && mount -n --move /root /mnt/mnt pivot_root . mnt || error " Could not execute pivot_root due to missing \ |