summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-04-30 18:51:20 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:08 +0100
commit43f7b85d0f1ae734f67e0508899fabac8b2951c9 (patch)
tree64c75436863160fc1a73054f6b3730eb9851e04e
parentf46f34335c75248f8625232e72fb0635702bd6cc (diff)
downloadlive-boot-43f7b85d0f1ae734f67e0508899fabac8b2951c9.tar.gz
live-boot-43f7b85d0f1ae734f67e0508899fabac8b2951c9.zip
Merging casper 1.198.
-rw-r--r--docs/ChangeLog.casper6
-rwxr-xr-xscripts/live9
2 files changed, 15 insertions, 0 deletions
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"