summaryrefslogtreecommitdiffstats
path: root/os-plugins
diff options
context:
space:
mode:
authorSebastian2010-08-22 19:55:54 +0200
committerSebastian2010-08-22 19:55:54 +0200
commit4540016d74d4f9f51f2286ff0e8bbb94950539d1 (patch)
tree5724373931bbaafc6b49fd79e21b63b9b1e3ca14 /os-plugins
parentfix bad libm (diff)
downloadcore-4540016d74d4f9f51f2286ff0e8bbb94950539d1.tar.gz
core-4540016d74d4f9f51f2286ff0e8bbb94950539d1.tar.xz
core-4540016d74d4f9f51f2286ff0e8bbb94950539d1.zip
fix bug, kdm didn't start if spashy wasn't running
Diffstat (limited to 'os-plugins')
-rw-r--r--os-plugins/plugins/bootsplash/XX_bootsplash.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/os-plugins/plugins/bootsplash/XX_bootsplash.sh b/os-plugins/plugins/bootsplash/XX_bootsplash.sh
index c405d735..77ae7bac 100644
--- a/os-plugins/plugins/bootsplash/XX_bootsplash.sh
+++ b/os-plugins/plugins/bootsplash/XX_bootsplash.sh
@@ -40,11 +40,10 @@ if [ -e /initramfs/plugin-conf/bootsplash.conf ]; then
if [ -f $dmfile ]; then
sed -e "s,^script.*,script\n\t#0x42#," \
-e "s,#0x42#,# shutdown splashy - added by splashy plugin\n\t#0x42#," \
- -e "s,#0x42#,if [ ! -e /var/run/splashy-killed ]; then\n\t#0x42#, " \
+ -e "s,#0x42#,if [ ! \"x$(ps aux |grep splashy |grep -v grep | wc -l)\" -eq \"x0\" ]; then\n\t#0x42#, " \
-e "s,#0x42#, LD_LIBRARY_PATH=/opt/openslx/uclib-rootfs/lib/ \\\\\n\t#0x42#," \
-e "s,#0x42#, /opt/openslx/plugin-repo/bootsplash/bin/splashy_update exit \\\\\n\t#0x42#," \
-e "s,#0x42#, 2>/dev/null \n\t#0x42#," \
- -e "s,#0x42#, touch /var/run/splashy-killed \n\t#0x42#," \
-e "s,#0x42#,fi \n\t#0x42#," \
-e "s,#0x42#,#splashy-stop-done#," \
-i $dmfile 2>/dev/null &