summaryrefslogtreecommitdiffstats
path: root/initramfs/stage3-stuff/init
diff options
context:
space:
mode:
authorDirk von Suchodoletz2008-10-15 00:22:44 +0200
committerDirk von Suchodoletz2008-10-15 00:22:44 +0200
commitd2b64d7dd66d009dc5ed001ada01e5a0ffacfd2a (patch)
tree1b67ade5a9af1e312b2f06305debb7aca77ee3d7 /initramfs/stage3-stuff/init
parentWrong escape before $location (creation of a proper runlevel script (diff)
downloadcore-d2b64d7dd66d009dc5ed001ada01e5a0ffacfd2a.tar.gz
core-d2b64d7dd66d009dc5ed001ada01e5a0ffacfd2a.tar.xz
core-d2b64d7dd66d009dc5ed001ada01e5a0ffacfd2a.zip
Applying init-wrapper to the init-hook system.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2302 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/stage3-stuff/init')
-rwxr-xr-xinitramfs/stage3-stuff/init10
1 files changed, 4 insertions, 6 deletions
diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init
index 42a2a1da..434f6973 100755
--- a/initramfs/stage3-stuff/init
+++ b/initramfs/stage3-stuff/init
@@ -14,10 +14,8 @@
# clients version 4
#############################################################################
-# fixme: shut down if script fails - this does not really work in case of
-# script crash
-trap "exec (sleep 30; echo o>/proc/sysrq-trigger)" \
- SIGHUP SIGINT SIGPIPE SIGTERM SIGKILL
+# fixme: the primary init script should never fail, so move all critical code
+# into sub script calls (see ticket 259)
# device files get their own filesystem (to be move mounted later)
devdir="/dev"
@@ -940,8 +938,8 @@ mount -n --move /dev /mnt/dev
runinithook '95-cleanup'
-# kill hwautocfg, servconfig
-killall -9 hwautocfg servconfig debugshell 2>/mnt/dev/null
+# kill hwautocfg, servconfig, hwinfo
+killall -9 hwautocfg servconfig debugshell hwinfo 2>/mnt/dev/null
# runtimer
[ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 20 ] && \
echo "** SLX init ended near $(sysup)"