Merging casper 1.198.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 246d4b7..cd2d646 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,9 @@
+casper (1.198) karmic; urgency=low
+
+  * scripts/casper: Send PULSELOGO usplash command at startup. (LP: #438762)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 02 Oct 2009 13:51:07 +0200
+
 casper (1.197) karmic; urgency=low
 
   [ Colin Watson ]

diff --git a/scripts/live b/scripts/live
index 3bb31c9..23ba434 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -1751,6 +1751,14 @@ integrity_check ()
        fi
 }
 
+start_usplash_pulse ()
+{
+       if [ -x /sbin/usplash_write ]
+       then
+               /sbin/usplash_write "PULSELOGO"
+       fi
+}
+
 mountroot ()
 {
         if [ -x /scripts/local-top/cryptroot ]; then
@@ -1770,6 +1778,7 @@ mountroot ()
        Arguments
 
        set_usplash_timeout
+       start_usplash_pulse
 
        maybe_break live-premount
        log_begin_msg "Running /scripts/live-premount"