From f8c9d2eed804ee4ce86b65c3fb4cacb81bad3322 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 5 Dec 2011 17:48:13 +0100
Subject: plymouth: fix flickers

---
 src/os-plugins/plugins/plymouth/XX_plymouth.sh                        | 4 ++--
 .../plugins/plymouth/init-hooks/40-started-hw-config/plymouth.sh      | 3 ++-
 .../plugins/plymouth/init-hooks/95-handing-over/plymouth.sh           | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 src/os-plugins/plugins/plymouth/init-hooks/95-handing-over/plymouth.sh

(limited to 'src')

diff --git a/src/os-plugins/plugins/plymouth/XX_plymouth.sh b/src/os-plugins/plugins/plymouth/XX_plymouth.sh
index f9927eae..f1b99511 100644
--- a/src/os-plugins/plugins/plymouth/XX_plymouth.sh
+++ b/src/os-plugins/plugins/plymouth/XX_plymouth.sh
@@ -21,9 +21,9 @@ if [ -e /initramfs/plugin-conf/plymouth.conf ]; then
 
     if [ -f /mnt/etc/init/kdm.conf ];
     then
-      sed 's/exec kdm/plymouth quit \n exec kdm/g' -i /mnt/etc/init/kdm.conf
+      sed 's/exec kdm/$(sleep 0.5 \&\& plymouth quit) \&\n exec kdm/g' -i /mnt/etc/init/kdm.conf
     else
-      sed 's/exec kdm/plymouth quit \n exec kdm/g' -i /mnt/etc/init.inactive/kdm.conf
+      sed 's/exec kdm/$(sleep 0.5 \&\& plymouth quit) \&\n exec kdm/g' -i /mnt/etc/init.inactive/kdm.conf
     fi
     [ $DEBUGLEVEL -gt 0 ] && echo "done with the 'plymouth' plugin...";
   fi
diff --git a/src/os-plugins/plugins/plymouth/init-hooks/40-started-hw-config/plymouth.sh b/src/os-plugins/plugins/plymouth/init-hooks/40-started-hw-config/plymouth.sh
index 19c26862..54a86774 100644
--- a/src/os-plugins/plugins/plymouth/init-hooks/40-started-hw-config/plymouth.sh
+++ b/src/os-plugins/plugins/plymouth/init-hooks/40-started-hw-config/plymouth.sh
@@ -1,4 +1,5 @@
 # only start with no debug level
 if [ $DEBUGLEVEL -eq 0 ]; then
-  plymouthd && plymouth show-splash
+  /sbin/plymouthd --mode=boot --attach-to-session
+  /bin/plymouth show-splash
 fi
diff --git a/src/os-plugins/plugins/plymouth/init-hooks/95-handing-over/plymouth.sh b/src/os-plugins/plugins/plymouth/init-hooks/95-handing-over/plymouth.sh
new file mode 100644
index 00000000..d7f27411
--- /dev/null
+++ b/src/os-plugins/plugins/plymouth/init-hooks/95-handing-over/plymouth.sh
@@ -0,0 +1,4 @@
+# only start with no debug level
+if [ $DEBUGLEVEL -eq 0 ]; then
+  /bin/plymouth update-root-fs --new-root-dir=/mnt
+fi
-- 
cgit v1.2.3-55-g7522