From d2b64d7dd66d009dc5ed001ada01e5a0ffacfd2a Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Tue, 14 Oct 2008 22:22:44 +0000
Subject: 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
---
 initramfs/stage3-stuff/etc/functions                        |  4 +++-
 initramfs/stage3-stuff/init                                 | 10 ++++------
 os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh |  1 -
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/initramfs/stage3-stuff/etc/functions b/initramfs/stage3-stuff/etc/functions
index d84c3056..9e308b7d 100644
--- a/initramfs/stage3-stuff/etc/functions
+++ b/initramfs/stage3-stuff/etc/functions
@@ -540,7 +540,9 @@ local hook=$1
 if [ -d /etc/init-hooks/$hook ]; then
   for hook_script in /etc/init-hooks/$hook/*.sh; do
     if [ -e $hook_script ]; then
-      . $hook_script
+      [ $DEBUGLEVEL -eq 15 ] \
+          && sed '/^#!/ a\\set -x' -i $hook_script
+      init-wrapper $hook_script
     fi
   done
 fi
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)"
diff --git a/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh b/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh
index 37290a51..880bcb8d 100644
--- a/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh
+++ b/os-plugins/plugins/xserver/init-hooks/00-started/xserver.sh
@@ -1,4 +1,3 @@
-#!/bin/ash
 # get an idea of the installed graphics hardware - might be needed if the
 # automatic Xorg configation fails in this field. If no useable info was
 # detected just delete the file.
-- 
cgit v1.2.3-55-g7522