diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-11-11 17:41:58 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:02 +0100 |
| commit | 960ca9ffec409718fb81cc497d6822c38c676a2b (patch) | |
| tree | 95d5fad9aee3d8b5acc7c4490ceb9693c766ca66 | |
| parent | c3e20f8ca4cd37d2641007947e58c781fd501f11 (diff) | |
| download | live-boot-960ca9ffec409718fb81cc497d6822c38c676a2b.tar.gz live-boot-960ca9ffec409718fb81cc497d6822c38c676a2b.zip | |
Merging casper 1.141.
| -rw-r--r-- | docs/ChangeLog.casper | 19 | ||||
| -rwxr-xr-x | scripts/live | 6 |
2 files changed, 22 insertions, 3 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 1984c57..ae7c735 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,22 @@ +casper (1.141) intrepid; urgency=low + + [ Johannes Ballé ] + * Handle spaces in file names in md5sum.txt (LP: #251112). + + [ Colin Watson ] + * Support ?= (set value but don't mark as seen) preseeding syntax in + preseed script; previously we only supported it in the keyboard script, + which confusingly doesn't deal with propagating console-setup/* preseeds + to the target filesystem (LP: #253749). + * Update to localechooser's new languagelist format. + + [ Tormod Volden ] + * scripts/casper: don't scan floppy drives for livefs images (LP: #97306) + * scripts/casper: fix broken RE in is_nice_device() (LP: #250328) + * scripts/casper: properly use argument $1 in matches_uuid() + + -- Colin Watson <cjwatson@ubuntu.com> Fri, 19 Sep 2008 02:14:05 +0100 + casper (1.140) intrepid; urgency=low [ Colin Watson ] diff --git a/scripts/live b/scripts/live index 9c747d5..846e10f 100755 --- a/scripts/live +++ b/scripts/live @@ -509,7 +509,7 @@ matches_uuid () path="${1}" uuid="$(cat /conf/uuid.conf)" - for try_uuid_file in "${mountpoint}/.disk/live-uuid"* + for try_uuid_file in "${path}/.disk/live-uuid"* do [ -e "${try_uuid_file}" ] || continue @@ -578,7 +578,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])" + if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-[^-]*-(ide|scsi|usb))" then return 0 elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$' @@ -1369,7 +1369,7 @@ find_livefs () fi # or do the scan of block devices - for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v 'dm-' | grep -v fd ) + for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)" do devname=$(sys2dev "${sysblock}") fstype=$(get_fstype "${devname}") |