summaryrefslogtreecommitdiffstats
path: root/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh
diff options
context:
space:
mode:
authorSebastian Schmelzer2008-10-15 13:05:22 +0200
committerSebastian Schmelzer2008-10-15 13:05:22 +0200
commitd3ebb85b0947f170f522f6721247253c5b6e4b27 (patch)
treebd932bc4d530ad1ec0969d3267b1f7ceb6cbfc3f /os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh
parent * minor fixes (diff)
downloadcore-d3ebb85b0947f170f522f6721247253c5b6e4b27.tar.gz
core-d3ebb85b0947f170f522f6721247253c5b6e4b27.tar.xz
core-d3ebb85b0947f170f522f6721247253c5b6e4b27.zip
* revert to r2302 / remove plugin env variables workaround
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2313 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh')
-rw-r--r--os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh14
1 files changed, 9 insertions, 5 deletions
diff --git a/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh b/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh
index 6ccbd9f0..e69900ce 100644
--- a/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/init-hooks/05-have-kernelvars/bootsplash.sh
@@ -5,9 +5,13 @@ if grep -E "(VESA|VGA)" /proc/fb > /dev/null 2>&1 \
> /dev/null 2>&1 \
&& [ $DEBUGLEVEL -eq 0 ] \
&& [ -e /bin/splashy ] ; then
- echo "we have bootsplash" >/tmp/bootsplash
- /bin/splashy boot 2>/dev/null
- # add splashy.stop runlevel script (does not work any more here,
- # temporarily moved to init awaiting a proper solution)
- #D_SPLASHY=splashy.stop
+ export no_bootsplash=0
+else
+ export no_bootsplash=1
+fi
+
+if [ ${no_bootsplash} -eq 0 ]; then
+ /bin/splashy boot 2>/dev/null
+ # add splashy.stop runlevel script
+ export D_SPLASHY=splashy.stop
fi