* fix for #212

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2295 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 37 insertions, 2 deletions

diff --git a/initramfs/stage3-stuff/bin/init-wrapper b/initramfs/stage3-stuff/bin/init-wrapper
new file mode 100755
index 00000000..3efd1cf4
--- /dev/null
+++ b/initramfs/stage3-stuff/bin/init-wrapper
@@ -0,0 +1,28 @@
+#!/bin/ash
+# Copyright (c) 2006..2008 - OpenSLX GmbH
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your feedback to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org
+#
+# wrapperscript for plugin init files
+#############################################################################
+
+# how do the localization here? There is not yet a country-Variable
+. /etc/messages
+. /etc/functions
+. /etc/distro-functions
+
+# configuration settings for this slx system's environment
+. /etc/slxsystem.conf 2>/dev/null
+
+# initramfs-setup configuration (common initial settings for all clients using
+# a certain InitRamFS generated by slxconfig-demuxer)
+[ -f /etc/initramfs-setup ] && . /etc/initramfs-setup 2>/dev/null
+
+[ -f $1 ] && . $1
+
diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init
index 932bbe93..42a2a1da 100755
--- a/initramfs/stage3-stuff/init
+++ b/initramfs/stage3-stuff/init
@@ -875,10 +875,17 @@ else
     for plugin_starter in /etc/plugin-init.d/*.sh; do
       if [ -e $plugin_starter ]; then
         [ $DEBUGLEVEL -gt 0 ] \
-          && echo "Running plugin starter $plugin_starter ..."
+          && echo -n "Running plugin starter $plugin_starter ..."
         [ $DEBUGLEVEL -eq 15 ] \
           && sed '/^#!/ a\\set -x' -i $plugin_starter
-        . $plugin_starter >>/tmp/plugin_starter 2>&1
+          init-wrapper $plugin_starter >>/tmp/plugin_starter 2>&1
+          if [ $? -eq 0 ]; then
+            [ $DEBUGLEVEL -gt 0 ] \
+            && echo " ok"
+          else
+            [ $DEBUGLEVEL -gt 0 ] \
+            && echo " failed"
+          fi
       fi
     done
   fi