From fde425d2487029d0d3872897ab10fd2285ebe1b3 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 21 Dec 2006 23:46:49 +0000
Subject: 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
---
 initramfs/initrd-stuff/init | 5 +----
 1 file changed, 1 insertion(+), 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"
-- 
cgit v1.2.3-55-g7522