diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-04-30 18:52:47 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:08 +0100 |
| commit | 24b9fd1c70013f5847d3a4658e56bd44534e7890 (patch) | |
| tree | 6e6d6ca7a8e91127ba542f129767ddd5a554a64d | |
| parent | 43f7b85d0f1ae734f67e0508899fabac8b2951c9 (diff) | |
| download | live-boot-24b9fd1c70013f5847d3a4658e56bd44534e7890.tar.gz live-boot-24b9fd1c70013f5847d3a4658e56bd44534e7890.zip | |
Merging casper 1.199.
| -rw-r--r-- | docs/ChangeLog.casper | 7 | ||||
| -rwxr-xr-x | scripts/live | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index cd2d646..25b004d 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,10 @@ +casper (1.199) karmic; urgency=low + + [ Tormod Volden ] + * Scan device-mapper (RAID) devices for live filesystem (LP: #385305). + + -- Colin Watson <cjwatson@ubuntu.com> Tue, 06 Oct 2009 23:39:57 +0100 + casper (1.198) karmic; urgency=low * scripts/casper: Send PULSELOGO usplash command at startup. (LP: #438762) diff --git a/scripts/live b/scripts/live index 23ba434..76b0be4 100755 --- a/scripts/live +++ b/scripts/live @@ -672,6 +672,9 @@ is_nice_device () elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$' then return 0 + elif echo ${sysfs_path} | grep -q "^/block/dm-" + then + return 0 fi return 1 |