[SCM] debian-live/live-initramfs branch, master, updated. 1.110.7-1-3-gee4dcce

[Daniel Baumann]

The branch, master has been updated
       via  ee4dcceabed9562b5e012b5624660b92f8432192 (commit)
       via  f6d42630c63d3292747217f3dc1e9e1f2726dd08 (commit)
      from  e201f26f459796de309e57764d38dce9f9011e85 (commit)


- Shortlog ------------------------------------------------------------
ee4dcce Bumping version to 1.110.1-1.
f6d4263 Merging casper 1.111.

Summary of changes:
 Makefile               |    2 +-
 debian/changelog       |    6 ++++++
 docs/ChangeLog.casper  |    8 ++++++++
 docs/parameters.txt    |    2 +-
 scripts/live           |   10 ----------
 scripts/live-functions |   11 -----------
 6 files changed, 16 insertions(+), 23 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit ee4dcceabed9562b5e012b5624660b92f8432192
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Dec 22 09:54:28 2007 +0100

    Bumping version to 1.110.1-1.

diff --git a/Makefile b/Makefile
index 58fa660..f9c9ffe 100644
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ update:
 		sed -i	-e 's/2007\\-11\\-19/2007\\-11\\-26/' \
 			-e 's/2007-11-19/2007-11-26/' \
 			-e 's/19.11.2007/26.11.2007/' \
-			-e 's/1.110.7/1.110.8/' \
+			-e 's/1.111.1/1.111.2/' \
 		$$FILE; \
 	done
 
diff --git a/debian/changelog b/debian/changelog
index 48fa877..8a4ced4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-initramfs (1.111.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel at debian>  Mon, 26 Nov 2007 00:00:00 +0100
+
 live-initramfs (1.110.7-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/docs/parameters.txt b/docs/parameters.txt
index c9c8c91..851aa25 100644
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -1,7 +1,7 @@
 Boot Parameters for Debian Live
 -------------------------------
 
-Updated for live-initramfs 1.110.7-1 on 2007-11-19.
+Updated for live-initramfs 1.111.1-1 on 2007-11-19.
 
 These options (can be combined) work from the bootloader prompt:
 

commit f6d42630c63d3292747217f3dc1e9e1f2726dd08
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Dec 22 09:53:08 2007 +0100

    Merging casper 1.111.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index f4954ba..2c0edde 100644
--- 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 at 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
--- 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
--- 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

-- 
debian-live/live-initramfs