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

[Waldemar Brodkorb]

Author: wbx-guest
Date: 2010-04-11 12:14:11 +0000 (Sun, 11 Apr 2010)
New Revision: 5760

Modified:
   people/wbx/fai-plymouth/README.plymouth
   people/wbx/fai-plymouth/bin/fai
   people/wbx/fai-plymouth/conf/NFSROOT
   people/wbx/fai-plymouth/lib/subroutines
Log:
remove absolute path, suggested by Thomas. Add example for plymouth-theme-fai package usage.

Modified: people/wbx/fai-plymouth/README.plymouth
===================================================================
--- people/wbx/fai-plymouth/README.plymouth	2010-04-11 12:07:12 UTC (rev 5759)
+++ people/wbx/fai-plymouth/README.plymouth	2010-04-11 12:14:11 UTC (rev 5760)
@@ -1,3 +1,13 @@
 this branch is for plymouth integration in fai install process.
+
+If you like to try with a very simple plymouth theme, checkout
+following from subversion:
+$ svn co svn://svn.debian.org/svn/fai/people/wbx/plymouth-theme-fai
+
+And build:
+$ cd plymouth-theme-fai
+$ debuild
+Add the resulting package to your repository.
+
 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 12:07:12 UTC (rev 5759)
+++ people/wbx/fai-plymouth/bin/fai	2010-04-11 12:14:11 UTC (rev 5760)
@@ -107,10 +107,10 @@
 
     if [ "$faisplash" ];then
    	 if [ -x /sbin/plymouthd ]; then
-	   /sbin/plymouthd --mode=boot --attach-to-session --pid-file=/tmp/plymouth.pid
+	   plymouthd --mode=boot --attach-to-session --pid-file=/tmp/plymouth.pid
 	 fi
          if [ -x /bin/plymouth ];then
-	   /bin/plymouth show-splash &
+	   plymouth show-splash &
 	 fi
     else
     	prcopyleft
@@ -316,7 +316,7 @@
 [ "$action" ] && export FAI_ACTION=$action
 unset action
 if [ "$faisplash" ];then
-	/bin/plymouth message --text "start installation" &
+  plymouth message --text "start installation" &
 fi
 task action 2>&1 | tee -a $LOGDIR/fai.log
 

Modified: people/wbx/fai-plymouth/conf/NFSROOT
===================================================================
--- people/wbx/fai-plymouth/conf/NFSROOT	2010-04-11 12:07:12 UTC (rev 5759)
+++ people/wbx/fai-plymouth/conf/NFSROOT	2010-04-11 12:14:11 UTC (rev 5760)
@@ -7,7 +7,7 @@
 dnsutils ntpdate dosfstools jove xfsprogs xfsdump
 procinfo dialog discover console-setup
 iproute udev subversion liblinux-lvm-perl
-plymouth-theme-ubuntu-text
+plymouth-theme-fai
 
 # needed for the simple examples
 cfengine2 libapt-pkg-perl

Modified: people/wbx/fai-plymouth/lib/subroutines
===================================================================
--- people/wbx/fai-plymouth/lib/subroutines	2010-04-11 12:07:12 UTC (rev 5759)
+++ people/wbx/fai-plymouth/lib/subroutines	2010-04-11 12:14:11 UTC (rev 5760)
@@ -151,7 +151,7 @@
     else
 	echo "Calling task_$taskname"
         if [ "$faisplash" ];then
-          /bin/plymouth message --text "Calling task: $taskname"
+          plymouth message --text "Calling task: $taskname"
         fi
 	sendmon "TASKBEGIN $taskname"
 	task_error=0   # task can set this variable to indicate an error
@@ -444,7 +444,7 @@
     wait_for_jobs
     echo "Press <RETURN> to reboot."
     if [ "$faisplash" ];then
-      /bin/plymouth message --text "Press <RETURN> to reboot."
+      plymouth message --text "Press <RETURN> to reboot."
     fi
     : ${flag_reboot:=0}
     [ -s $LOGDIR/error.log -a "$flag_reboot" -gt "0" ] && sleep 10