[Fai-commit] r5757 - in people/wbx/fai-plymouth: . bin lib

[Waldemar Brodkorb]

Author: wbx-guest
Date: 2010-04-11 09:10:19 +0000 (Sun, 11 Apr 2010)
New Revision: 5757

Modified:
   people/wbx/fai-plymouth/README.plymouth
   people/wbx/fai-plymouth/bin/fai
   people/wbx/fai-plymouth/lib/subroutines
Log:
start plymouthd and print task messages on bootup

Modified: people/wbx/fai-plymouth/README.plymouth
===================================================================
--- people/wbx/fai-plymouth/README.plymouth	2010-04-11 09:09:18 UTC (rev 5756)
+++ people/wbx/fai-plymouth/README.plymouth	2010-04-11 09:10:19 UTC (rev 5757)
@@ -1 +1,3 @@
-this branch is for plymouth integration in fai install process
+this branch is for plymouth integration in fai install process.
+add following to your kernel append line to activate plymouth:
+quiet faisplash=1 

Modified: people/wbx/fai-plymouth/bin/fai
===================================================================
--- people/wbx/fai-plymouth/bin/fai	2010-04-11 09:09:18 UTC (rev 5756)
+++ people/wbx/fai-plymouth/bin/fai	2010-04-11 09:10:19 UTC (rev 5757)
@@ -98,14 +98,23 @@
 	mkdir -p /var/run/network /dev/shm/network # when using initrd kernels
 	ifup lo
 	[ -x /sbin/portmap ] && /sbin/portmap
-	mount -t devpts devpts /dev/pts
+	[ -d /dev/pts ] || mount -t devpts devpts /dev/pts
 	cat /proc/kmsg >/dev/tty4 &
     fi
 
     # since HOSTNAME may change define classes now, so we can call hooks before fai-class is called
     [ -z "$classes" ] && classes="DEFAULT $(uname -s | tr a-z A-Z) $HOSTNAME LAST"
 
-    prcopyleft
+    if [ "$faisplash" ];then
+   	 if [ -x /sbin/plymouthd ]; then
+	   /sbin/plymouthd --mode=boot --attach-to-session --pid-file=/tmp/plymouth.pid
+	 fi
+         if [ -x /bin/plymouth ];then
+	   /bin/plymouth show-splash &
+	 fi
+    else
+    	prcopyleft
+    fi
 
     [ $do_init_tasks -eq 1 ] && save_dmesg
 }
@@ -306,6 +315,9 @@
 
 [ "$action" ] && export FAI_ACTION=$action
 unset action
+if [ "$faisplash" ];then
+	/bin/plymouth message --text "start installation" &
+fi
 task action 2>&1 | tee -a $LOGDIR/fai.log
 
 [ -L "/var/run/fai/current_config" ] && rm -f "/var/run/fai/current_config"

Modified: people/wbx/fai-plymouth/lib/subroutines
===================================================================
--- people/wbx/fai-plymouth/lib/subroutines	2010-04-11 09:09:18 UTC (rev 5756)
+++ people/wbx/fai-plymouth/lib/subroutines	2010-04-11 09:10:19 UTC (rev 5757)
@@ -150,6 +150,9 @@
 	sendmon "TASKSKIP $taskname"
     else
 	echo "Calling task_$taskname"
+        if [ "$faisplash" ];then
+          /bin/plymouth message --text "Calling task: $taskname"
+        fi
 	sendmon "TASKBEGIN $taskname"
 	task_error=0   # task can set this variable to indicate an error
 	task_error_func=''
@@ -440,6 +443,9 @@
     [ $do_init_tasks -eq 0 ] && exit 0
     wait_for_jobs
     echo "Press <RETURN> to reboot."
+    if [ "$faisplash" ];then
+      /bin/plymouth message --text "Press <RETURN> to reboot."
+    fi
     : ${flag_reboot:=0}
     [ -s $LOGDIR/error.log -a "$flag_reboot" -gt "0" ] && sleep 10
     # reboot without prompting if FAI_FLAG reboot is set