Merging casper 1.170.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index a62e48c..22a873a 100644 (file)
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,11 @@
+casper (1.170) jaunty; urgency=low
+
+  * is_nice_device(): allow devices with an ID_PATH of platform-mmc* as well
+    as used for instance for SD cards on the ARM iMX51 Babbage board;
+    LP: #357700.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 08 Apr 2009 15:34:01 +0200
+
 casper (1.169) jaunty; urgency=low
 
   * [ -w /cdrom ] turns out not to be a sufficient test for files under

diff --git a/scripts/live b/scripts/live
index 2753d5e..6af14c3 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -621,7 +621,7 @@ is_nice_device ()
 {
        sysfs_path="${1#/sys}"
 
-       if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-)"
+       if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-|platform-mmc)"
        then
                return 0
        elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'