[Debian-live-changes] r1325 - in dists/trunk/live-initramfs: debian doc

[Daniel Baumann]

Author: daniel
Date: 2007-05-06 15:02:41 +0000 (Sun, 06 May 2007)
New Revision: 1325

Modified:
   dists/trunk/live-initramfs/debian/init
   dists/trunk/live-initramfs/doc/ChangeLog
Log:


Modified: dists/trunk/live-initramfs/debian/init
===================================================================
--- dists/trunk/live-initramfs/debian/init	2007-05-06 14:56:32 UTC (rev 1324)
+++ dists/trunk/live-initramfs/debian/init	2007-05-06 15:02:41 UTC (rev 1325)
@@ -71,17 +71,27 @@
         cache_path "$path"
     done
 
-    eject -p -m /cdrom >/dev/null 2>&1
+    for x in $(cat /proc/cmdline); do
+    	case $x in
+	    quickreboot)
+	    	QUICKREBOOT="Yes"
+		;;
+	esac
+    done
 
-    # XXX - i18n
-    echo "Please remove the disc and close the tray (if any) then press ENTER: "
-    if [ -x /sbin/usplash_write ]; then
-        /sbin/usplash_write "TIMEOUT 86400"
-        /sbin/usplash_write "TEXT-URGENT Please remove the disc, close the tray (if any)"
-        /sbin/usplash_write "TEXT-URGENT and press ENTER to continue"
+    if [ -z ${QUICKREBOOT} ]; then
+    	eject -p -m /live_media >/dev/null 2>&1
+
+	# XXX - i18n
+	echo "Please remove the disc and close the tray (if any) then press ENTER: "
+	if [ -x /sbin/usplash_write ]; then
+	     /sbin/usplash_write "TIMEOUT 86400"
+	     /sbin/usplash_write "TEXT-URGENT Please remove the disc, close the tray (if any)"
+	     /sbin/usplash_write "TEXT-URGENT and press ENTER to continue"
+	fi
+
+	read x < /dev/console
     fi
-
-    read x < /dev/console
 }
 
 case "$1" in

Modified: dists/trunk/live-initramfs/doc/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 14:56:32 UTC (rev 1324)
+++ dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 15:02:41 UTC (rev 1325)
@@ -3,6 +3,8 @@
 	* Merging patches from casper 1.81+debian-4.
 	* doc/ChangeLog.casper:
 	  - Added missing debian uploads.
+	* debian/init:
+	  - Added patch to support quickreboot.
 
 2007-05-06  Daniel Baumann  <daniel at debian.org>