r2638 - in dists/trunk/live-initramfs: docs scripts/live-premount

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-29 17:34:59 +0000 (Sun, 29 Jul 2007)
New Revision: 2638

Modified:
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/docs/ChangeLog.casper
   dists/trunk/live-initramfs/scripts/live-premount/10driver_updates
Log:


Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-07-29 17:30:59 UTC (rev 2637)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-07-29 17:34:59 UTC (rev 2638)
@@ -1,3 +1,7 @@
+2007-07-29  Daniel Baumann  <daniel at debian.org>
+
+	* Merging changes from casper 1.95.
+
 2007-07-26  Daniel Baumann  <daniel at debian.org>
 
 	* Merging changes from casper 1.92, 1.93 and 1.94.

Modified: dists/trunk/live-initramfs/docs/ChangeLog.casper
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog.casper	2007-07-29 17:30:59 UTC (rev 2637)
+++ dists/trunk/live-initramfs/docs/ChangeLog.casper	2007-07-29 17:34:59 UTC (rev 2638)
@@ -1,3 +1,11 @@
+casper (1.95) gutsy; urgency=low
+
+  * Fix regex syntax error while looking for non-CD devices for driver
+    updates.
+  * Fix ip= boot parameter, documented but not properly merged from Debian.
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Fri, 27 Jul 2007 15:03:41 +0100
+
 casper (1.94) gutsy; urgency=low
 
   [ Colin Watson ]

Modified: dists/trunk/live-initramfs/scripts/live-premount/10driver_updates
===================================================================
--- dists/trunk/live-initramfs/scripts/live-premount/10driver_updates	2007-07-29 17:30:59 UTC (rev 2637)
+++ dists/trunk/live-initramfs/scripts/live-premount/10driver_updates	2007-07-29 17:34:59 UTC (rev 2638)
@@ -38,7 +38,7 @@
 
 is_nice_device() {
     sysfs_path="${1#/sys}"
-    if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-[^-]*-[ide|scsi|usb])"; then
+    if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-[^-]*-(ide|scsi|usb))"; then
         return 0
     fi
     return 1