summaryrefslogtreecommitdiffstats
path: root/initramfs
diff options
context:
space:
mode:
authorDirk von Suchodoletz2008-10-15 01:13:45 +0200
committerDirk von Suchodoletz2008-10-15 01:13:45 +0200
commit3b09b567acf72ad0c9200f6185165c0a05b27c1d (patch)
treef7d790f1df9f48e87ad9914e23968c603001cb07 /initramfs
parentNeeded changes because of the init-wrapper, new init-hook system, check (diff)
downloadcore-3b09b567acf72ad0c9200f6185165c0a05b27c1d.tar.gz
core-3b09b567acf72ad0c9200f6185165c0a05b27c1d.tar.xz
core-3b09b567acf72ad0c9200f6185165c0a05b27c1d.zip
Missing part of r2303 in init (suboptimal solution at the moment).
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2304 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
-rwxr-xr-xinitramfs/stage3-stuff/init4
1 files changed, 4 insertions, 0 deletions
diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init
index 434f6973..f1e1eb5a 100755
--- a/initramfs/stage3-stuff/init
+++ b/initramfs/stage3-stuff/init
@@ -311,6 +311,10 @@ $0\n# deprecated: please use rootfs=nfs://...\nnfsroot=\"${nfsroot}\"\n" \
done
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
# 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