[SCM] debian-live branch, master, updated. 1.139.1-1-2-g14f0f64

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 14f0f64c7b2a665f69aa78e4e63ef5f9c4c33a83
Author: Michal Suchanek <michal.suchanek at ruk.cuni.cz>
Date:   Tue Aug 26 15:14:23 2008 +0200

    Enabling the "remove CD" prompt in splashy.

diff --git a/scripts/live b/scripts/live
index ec5f6e8..4ba4257 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1338,7 +1338,9 @@ set_usplash_timeout ()
 	if [ -x /sbin/usplash_write ]
 	then
 		/sbin/usplash_write "TIMEOUT 120"
-	fi
+	else if [ -x /sbin/splashy_update ] ; then
+		/sbin/splashy_update "TIMEOUT 120"
+	fi ; fi
 }
 
 mountroot ()
diff --git a/scripts/live-functions b/scripts/live-functions
index 0684dc0..96d6269 100644
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -50,7 +50,9 @@ log_wait_msg ()
 	then
 		/sbin/usplash_write "INPUTENTER ${@}"
 		read nunya < /dev/.initramfs/usplash_outfifo
-	fi
+	else if [ -x /sbin/splashy_update ] ; then
+		/sbin/splashy_update "getstring ${@}" | read nunya
+	fi ; fi
 
 	_log_msg "Waiting: ${@} ... \n"
 }

-- 
debian-live