summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Tappe2008-02-10 19:46:57 +0100
committerOliver Tappe2008-02-10 19:46:57 +0100
commit412bf6ef92ed983bb1b2cb6a34980d4d46852a05 (patch)
tree2089e9a76a82072bfbd0ddb5625b4a04adebef6f
parent* implement support for letting the plugins suggest additional kernel_params (diff)
downloadcore-412bf6ef92ed983bb1b2cb6a34980d4d46852a05.tar.gz
core-412bf6ef92ed983bb1b2cb6a34980d4d46852a05.tar.xz
core-412bf6ef92ed983bb1b2cb6a34980d4d46852a05.zip
* check for /bin/splashy before we try to invoke it, avoids error when
theme-plugin is active, but theme::splashy is empty git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1533 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh b/os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh
index e1f2b31d..e2f8f089 100644
--- a/os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh
+++ b/os-plugins/plugins/theme/init-hooks/05-have-kernelvars/theme.sh
@@ -2,7 +2,8 @@
# only activate with kernel option quiet and no debuglevel
if grep -E "(VESA|VGA)" /proc/fb > /dev/null 2>&1 \
&& grep -qi " quiet " /proc/cmdline > /dev/null 2>&1 \
- && [ $DEBUGLEVEL -eq 0 ] ; then
+ && [ $DEBUGLEVEL -eq 0 ] \
+ && [ -e /bin/splashy ] ; then
export theme_nosplash=0
else
export theme_nosplash=1