From 77ff585ab48626ade2d312102ae98202bf8b8d98 Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Tue, 4 Dec 2012 18:32:15 +0100
Subject: - respect blacklisting of modules when autoloading modules in
 hwautocfg '-b' (stage3). - preinit.local enabled again for
 config/systemName/default, until now it was only possible for the default
 system in config/default. It make no sense for client specific configurations
 though.

---
 src/initramfs/scripts/init | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/initramfs/scripts/init')

diff --git a/src/initramfs/scripts/init b/src/initramfs/scripts/init
index 3f41d3c6..d1d7945b 100755
--- a/src/initramfs/scripts/init
+++ b/src/initramfs/scripts/init
@@ -121,8 +121,12 @@ runinithook '00-started'
 # run pre init script and user defined preinit.local, copied by mkdxsinitrd
 # from /var/lib/openslx/config/... in stage2
 preinit
-[ -x /bin/preinit.local ] && /bin/preinit.local
-
+[ -f /bin/preinit.local ] && {
+  [ $DEBUGLEVEL -gt 0 ] && \
+    echo -n "Running script /bin/preinit.local ... "
+  chmod u+x /bin/preinit.local
+  /bin/preinit.local
+  [ $DEBUGLEVEL -gt 0 ] && echo "ok"; }
 
 # switch off the several configuration methods, will be switched on
 # according to kernel commandline settings
-- 
cgit v1.2.3-55-g7522