diff options
| author | Dirk von Suchodoletz | 2008-10-15 02:37:46 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2008-10-15 02:37:46 +0200 |
| commit | 0079bdfc3367423d66dad53a789c507e4557c347 (patch) | |
| tree | e8a17ef2c16a508af905ccb40eadba4762f948a7 /initramfs | |
| parent | And one more missed (of r2303 checkin) ... (diff) | |
| download | core-0079bdfc3367423d66dad53a789c507e4557c347.tar.gz core-0079bdfc3367423d66dad53a789c507e4557c347.tar.xz core-0079bdfc3367423d66dad53a789c507e4557c347.zip | |
Finally recreated proper bootsplash functionality with wrapped init-hooks
(see #259).
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2307 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rw-r--r-- | initramfs/stage3-stuff/etc/functions | 2 | ||||
| -rwxr-xr-x | initramfs/stage3-stuff/init | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/initramfs/stage3-stuff/etc/functions b/initramfs/stage3-stuff/etc/functions index 9e308b7d..5bcd187d 100644 --- a/initramfs/stage3-stuff/etc/functions +++ b/initramfs/stage3-stuff/etc/functions @@ -542,7 +542,7 @@ if [ -d /etc/init-hooks/$hook ]; then if [ -e $hook_script ]; then [ $DEBUGLEVEL -eq 15 ] \ && sed '/^#!/ a\\set -x' -i $hook_script - init-wrapper $hook_script + /bin/init-wrapper $hook_script fi done fi diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init index f1e1eb5a..3e5e6920 100755 --- a/initramfs/stage3-stuff/init +++ b/initramfs/stage3-stuff/init @@ -314,7 +314,7 @@ runinithook '05-have-kernelvars' # fixme: not the proper way to set this variable, needed due to wrapper # script switching (avoid slx-init crashes because of faulty init-hook # scripts) -[ -e /tmp/bootsplash ] && D_SPLASHY=splashy.stop +[ -e /tmp/bootsplash ] && export D_SPLASHY=splashy.stop # at this point a timer should be started to ensure an automated reboot # or halt of the machine if SLX init does not succeed (e.g. missing kernel |