diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-04-30 18:15:46 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:08 +0100 |
| commit | 0ce3d8be7921ca1565ddc6567cb40e688075158c (patch) | |
| tree | d36ed3b05fe41508b16f2f28a8fe6851af5d2f00 | |
| parent | d3888c2f18f9282e493c8996a94788f884591a7e (diff) | |
| download | live-boot-0ce3d8be7921ca1565ddc6567cb40e688075158c.tar.gz live-boot-0ce3d8be7921ca1565ddc6567cb40e688075158c.zip | |
Merging casper 1.188.
| -rw-r--r-- | docs/ChangeLog.casper | 8 | ||||
| -rwxr-xr-x | scripts/live | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 4fa4ff3..19c2db2 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,11 @@ +casper (1.188) karmic; urgency=low + + * Allow for platform-orion-ehci in ID_PATH to qualify as a "nice_device" + i.e. one which can host a livefs. This is the name of the USB device + driver on Marvell Dove boards. + + -- Loïc Minier <loic.minier@ubuntu.com> Mon, 31 Aug 2009 14:16:21 +0200 + casper (1.187) karmic; urgency=low * Stop recommending unionfs-fuse, as we're using aufs again in Karmic. diff --git a/scripts/live b/scripts/live index 6318643..e73ee80 100755 --- a/scripts/live +++ b/scripts/live @@ -665,7 +665,7 @@ is_nice_device () { sysfs_path="${1#/sys}" - if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-|platform-mmc|platform-mxsdhci)" + if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-|platform-orion-ehci|platform-mmc|platform-mxsdhci|)" then return 0 elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$' |