diff options
author | Dirk von Suchodoletz | 2006-12-22 00:46:49 +0100 |
---|---|---|
committer | Dirk von Suchodoletz | 2006-12-22 00:46:49 +0100 |
commit | fde425d2487029d0d3872897ab10fd2285ebe1b3 (patch) | |
tree | a9fc9bad5d69e7c3b5b4c2fa366ef0a6d61d1bed /initramfs/initrd-stuff/init | |
parent | Fix for busybox nfs mount (uses UDP in default, so TCP has to be given (diff) | |
download | core-fde425d2487029d0d3872897ab10fd2285ebe1b3.tar.gz core-fde425d2487029d0d3872897ab10fd2285ebe1b3.tar.xz core-fde425d2487029d0d3872897ab10fd2285ebe1b3.zip |
Kill the "watchdog" properly at the end of init (stage3).
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@579 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/init')
-rwxr-xr-x | initramfs/initrd-stuff/init | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index 390022ac..b5388e4b 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -573,7 +573,7 @@ mount -n --move /dev /mnt/dev chmod a+rwxt /mnt/dev/shm killall -9 udevd 2>/dev/null # kill the watchdog (errhalt) -[ -f /tmp/watchdog ] && kill -9 $(cat /tmp/watchdogpid) #2>/dev/null +[ -f /tmp/watchdogpid ] && kill $(cat /tmp/watchdogpid) 2>/dev/null # runtimer [ $DEBUGLEVEL -eq 8 ] && echo "** SLX init ended near $(sysup)" umount -n /proc @@ -581,8 +581,5 @@ umount -n /proc unset debug date initrd ip dnbdroot nbdroot nfsroot vci vga unset BOOT_IMAGE KCMDLINE KERNEL MODPRV NWMODULES OLDPWD UDEVD_EVENT_TIMEOUT \ UDEVD_EXPECTED_SEQNUM -#strinstr "bash" "$(ls -la /bin/sh)" && EE="-c" # new style of pivoting (exec -c would set an empty environment in bash) -#exec run-init -c dev/console /mnt /sbin/init || error "$init_runinit" -# run-init could be replaced with switch_root from busybox ... exec switch_root -c dev/console /mnt /sbin/init || error "$init_runinit" |