summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-01-31 13:57:37 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:06 +0100
commit2dd7c308da963f84810583942dd39ee1c975a93e (patch)
tree3ff5d4c7371efad638411b923ed8d4ca066dbbb2
parent3f682b4344b8b6fb0e8478ce684783f183c4802d (diff)
downloadlive-boot-2dd7c308da963f84810583942dd39ee1c975a93e.tar.gz
live-boot-2dd7c308da963f84810583942dd39ee1c975a93e.zip
Merging casper 1.170.
-rw-r--r--docs/ChangeLog.casper8
-rwxr-xr-xscripts/live2
2 files changed, 9 insertions, 1 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index a62e48c..22a873a 100644
--- 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
--- 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]$'