Merging casper 1.109.

4 files changed, 30 insertions, 8 deletions

diff --git a/debian/init b/debian/init
index a24fe9f..d59ed45 100644
--- a/debian/init
+++ b/debian/init
@@ -68,7 +68,12 @@ do_stop ()
         return 0
     fi
 
-    for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default; do
+    prompt=1
+    if grep -qs noprompt /proc/cmdline; then
+       prompt=
+    fi
+
+    for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default $(which stty); do
         cache_path "${path}"
     done
 
@@ -84,6 +89,8 @@ do_stop ()
 	if [ -x /usr/bin/eject ]
 	then
 		eject -p -m /live/image >/dev/null 2>&1
+
+		[ "$prompt" ] || return 0
 	fi
 
 	stty sane < /dev/console
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index bfd3c50..4832706 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,13 @@
+casper (1.109) gutsy; urgency=low
+
+  * Cache the stty binary before ejecting the CD.
+  * Skip the CD eject prompt if 'noprompt' is on the kernel command line
+    (LP: #149159).
+  * Try each of (e.g.) 2.6.22-13-generic, 2.6.22-13, and 2.6.22 in turn as
+    directory names for driver updates (LP: #122430).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 05 Oct 2007 03:24:43 +0100
+
 casper (1.108) gutsy; urgency=low
 
   * If CASPER_GENERATE_UUID is set, generate a random UUID in the initramfs,
diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index 5bc0adf..0b1a4bf 100644
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -175,6 +175,10 @@ be checked at boot time, use this parameter, otherwise they are skipped.
 disables the "persistent" feature, useful if the bootloader (like syslinux) has
 been installed with persistent enabled.
 
+  noprompt
+
+Do not prompt to eject the CD on reboot.
+
   nosudo::
 
 This parameter disables the automatic configuration of sudo.
diff --git a/scripts/live-premount/10driver_updates b/scripts/live-premount/10driver_updates
index 22d64d2..3ad9ef6 100755
--- a/scripts/live-premount/10driver_updates
+++ b/scripts/live-premount/10driver_updates
@@ -41,18 +41,19 @@ is_updates_path ()
 	# kernel flavour.
 
 	path=${1}
-	kbase=$(uname -r | sed 's/^\([0-9]*\.[0-9]*\.[0-9]*\)-.*/\1/')
-	update_dir="${path}/ubuntu-drivers/${kbase}"
-
-	if [ -d "${update_dir}" ]
-	then
+        abi="$(uname -r)"
+        kver="$(echo "$abi" | cut -d- -f1,2)"
+        kbase="$(echo "$abi" | cut -d- -f1)"
+        for leaf in "$abi" "$kver" "$kbase"; do
+                update_dir="$path/ubuntu-drivers/$leaf"
+                [ -d "$update_dir" ] || continue
 		if [ "$(echo ${update_dir}/*_${DPKG_ARCH}.deb)" != \
 			"${update_dir}/*_${DPKG_ARCH}.deb" ]
 		then
 			echo "${update_dir}"
-			return 0;
+			return 0
 		fi
-	fi
+	done
 
 	return 1;
 }