From db3bdeb697a06b35cce61b52d83858757e82b8ec Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Sun, 13 Jan 2008 18:19:14 +0000
Subject: 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
---
 initramfs/initrd-stuff/etc/functions | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'initramfs/initrd-stuff/etc/functions')

diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 830e7008..577bf9b8 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -556,9 +556,9 @@ fi
 # execute all shell scripts in the given init-hook folder
 runinithook () {
 local hook=$1
-if [ -d /initramfs/init-hooks/$hook ]; then
-  for hook_script in /initramfs/init-hooks/$hook/*; do
-    . hook_script
+if [ -d /etc/init-hooks/$hook ]; then
+  for hook_script in /etc/init-hooks/$hook/*; do
+    . $hook_script
   done
 fi
 }
@@ -846,15 +846,17 @@ esac
 # setup initial boot scripts (for most standard distributions, gentoo is to
 # be handled differently)
 initial_boot () {
+local scripts=$*
 local count=10
 # boot.slx is a special runlevel script generated within initialramfs which
 # should be executed before the normal runlevel scripts. Proper shutdown is
 # not needed!?
-for i in boot.slx ${D_INITSCRIPTS}; do
+for i in boot.slx $scripts; do
   count=$(($count + 1))
-  revcnt=$((41 - $count))
+  echo "boot-runlevelscript $i"
   ln -sf /etc${D_INITDIR}/$i /mnt/etc/${D_INITBOOTD}/S${count}$i
   # uncomment if proper shutdown of bootup scripts is required
+  #revcnt=$((41 - $count))
   #ln -sf /etc${D_INITDIR}/$i /mnt/etc/${D_INITBOOTD}/K${revcnt}$i
 done
 }
-- 
cgit v1.2.3-55-g7522