Merging casper 1.111.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index f4954ba..2c0edde 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,11 @@
+casper (1.111) hardy; urgency=low
+
+  * Remove code to set the progress bar to throbbing, this now comes as
+    standard so we don't need to duplicate it or override things that
+    attempted to set progress.  LP: #162397.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Tue, 13 Nov 2007 20:49:31 +0000
+
 casper (1.110) gutsy; urgency=low
 
   * Don't generate fglrx or the nvidia modules in the live session at boot;

diff --git a/scripts/live b/scripts/live
index 80f77e9..a01221b 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -1198,14 +1198,6 @@ find_livefs ()
        return 1
 }
 
-pulsate ()
-{
-       if [ -x /sbin/usplash_write ]
-       then
-               /sbin/usplash_write "PULSATE"
-       fi
-}
-
 set_usplash_timeout ()
 {
        if [ -x /sbin/usplash_write ]
@@ -1225,7 +1217,6 @@ mountroot ()
 
        set_usplash_timeout
        [ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-premount"
-       pulsate
        run_scripts /scripts/live-premount
        [ "${quiet}" != "y" ] && log_end_msg
 
@@ -1291,7 +1282,6 @@ mountroot ()
        maybe_break live-bottom
        [ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-bottom"
 
-       pulsate
        run_scripts /scripts/live-bottom
        [ "${quiet}" != "y" ] && log_end_msg
 

diff --git a/scripts/live-functions b/scripts/live-functions
index 6fb57c6..964fdf0 100644 (file)
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -3,17 +3,6 @@
 . /scripts/functions
 . /live.vars
 
-log_end_msg ()
-{
-       # Override this so we don't call PROGRESS
-       if [ -x /sbin/usplash_write ]
-       then
-               /sbin/usplash_write "SUCCESS ok"
-       fi
-
-       _log_msg "Done."
-}
-
 log_wait_msg ()
 {
        # Print a message and wait for enter