diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-04-30 18:13:11 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:08 +0100 |
| commit | f1172ac042a963191d6a0f9eb57226a84e1ef720 (patch) | |
| tree | a6dce283b6cea005e585c71c97a990aaba74e5f3 | |
| parent | 395a2b87c5261d41d9ce436e27acca64d7c69146 (diff) | |
| download | live-boot-f1172ac042a963191d6a0f9eb57226a84e1ef720.tar.gz live-boot-f1172ac042a963191d6a0f9eb57226a84e1ef720.zip | |
Merging casper 1.186.
| -rw-r--r-- | docs/ChangeLog.casper | 13 | ||||
| -rwxr-xr-x | scripts/live | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index faeb733..edcf9e0 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,16 @@ +casper (1.186) karmic; urgency=low + + [ Loïc Minier ] + * Allow for platform-mxsdhci in ID_PATH to qualify as a "nice_device" i.e. + one which can host a livefs. This is the new name of this device in + 2.6.31 kernels on Babbage i.MX51. + + [ Steve Kowalik ] + * Rename 47unr-ubiquity as 47unr_ubiquity, as scripts with dashes don't + get installed into the initramfs. (LP: #411616) + + -- Steve Kowalik <stevenk@ubuntu.com> Fri, 14 Aug 2009 17:39:34 +1000 + casper (1.185) karmic; urgency=low * Actually set 47unr-ubiquity as executable.· diff --git a/scripts/live b/scripts/live index 21c3d99..6318643 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)" + if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-|platform-mmc|platform-mxsdhci)" then return 0 elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$' |