reimplemented splashy stuff via Theme plugin:

* activated invocation of init-hooks
* removed explicit splashy calls from init (they are now done
  in several init-hooks provided by the Theme plugin)
* the stage3 plugins are now invoked via '.' instead via a separate
  shell, such that they can export changed environment variables
* changed invocation of initial_boot() - we now pass in the list
  of initscripts as otherwise I have been unable to let this function
  access a changed D_INITSCRIPTS variable (it would only see initial
  content)
* moved invocation of initial_boot from servconfig to init (again
  such that a changed D_INITSCRIPTS will be handled correctly)
* config-demuxer now passes the active plugins into mkdxsinitrd
* mkdxsinitrd accepts a list of active plugins (-p) and copies
  the hooks directly into the initialramfs, such that they are
  available immediately in stage3

The bootsplash stuff (splashy) seems to work properly, but the handling of displaymanager themes is currently broken. I will look into
that tomorrow.


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

1 files changed, 11 insertions, 1 deletions

diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd
index 46225024..b822ee9e 100755
--- a/initramfs/mkdxsinitrd
+++ b/initramfs/mkdxsinitrd
@@ -82,6 +82,7 @@ usage()
   echo "  -f list of blockdev/filesystem modules"
   echo "  -n list of network adaptor modules"
   echo "  -m list of misc modules not covered by -f or -n"
+  echo "  -p list of active plugins"
   echo "  -r path to stage1 root (vendor OS, e.g. /var/opt/openslx/stage1/suse-..."
   echo "  -S name of the system for which the initramfs is built"
   echo "  -s theme (for splash)"
@@ -298,7 +299,7 @@ echo
 #########################################################################
 # End of function declaration
 
-while getopts :Cdhk:c:i:r:o:s:f:n:m:S:tu:wI:a: a ; do
+while getopts :Cdhk:c:i:r:o:s:f:n:m:p:S:tu:wI:a: a ; do
   case $a in
     \:|\?)
     case $OPTARG in
@@ -308,6 +309,7 @@ while getopts :Cdhk:c:i:r:o:s:f:n:m:S:tu:wI:a: a ; do
       f)  echo "-f requires file system module (list) parameter";;
       n)  echo "-n requires network module (list) parameter";;
       m)  echo "-m requires misc module (list) parameter";;
+      p)  echo "-p requires plugins (list) parameter";;
       r)  echo "-r requires root dir parameter";;
       s)  echo "-s may require theme name";;
       I)  echo "-I requires network interface parameter";;
@@ -326,6 +328,7 @@ while getopts :Cdhk:c:i:r:o:s:f:n:m:S:tu:wI:a: a ; do
     f)  FSMODULES=$OPTARG;;
     n)  NWMODULES=$OPTARG;;
     m)  MISCMODULES=$OPTARG;;
+    p)  PLUGINS=$OPTARG;;
     r)  ROOTDIR=$OPTARG;;
     s)  theme=$OPTARG;;
     S)  SYSTEM_NAME=$OPTARG;;
@@ -730,6 +733,13 @@ if [ -z "$cdboot" ] ; then
     test -f ${SLX_PRIVATE_PATH}/config/$cfg && \
       cp ${SLX_PRIVATE_PATH}/config/$cfg ${INSTDIR}/bin
   done
+  # copy init-hooks from all plugins which are going to be executed in stage3
+  mkdir -p ${INSTDIR}/etc/init-hooks
+  for plugin in $PLUGINS ; do
+    test -d ${SLX_BASE_PATH}/lib/plugins/$plugin/init-hooks && \
+      cp -r ${SLX_BASE_PATH}/lib/plugins/$plugin/init-hooks/* \
+            ${INSTDIR}/etc/init-hooks/
+  done
   # custom hardware configuration files pcitable.local and Cards.local
   # fixme!! New source for these files (instead of templates)!
   if [ -f ${SLX_SHARE_PATH}/templates/pcitable.local ] ; then