From: Daniel Baumann <daniel@debian.org>
Date: Fri, 30 Apr 2010 16:51:20 +0000 (+0200)
Subject: Merging casper 1.198.
X-Git-Tag: debian/2.0.15-1~168
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=43f7b85d0f1ae734f67e0508899fabac8b2951c9;p=live-boot-grml.git

Merging casper 1.198.
---

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 246d4b7..cd2d646 100644
--- 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
--- 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"