From: Daniel Baumann <daniel@debian.org>
Date: Fri, 30 Apr 2010 16:52:47 +0000 (+0200)
Subject: Merging casper 1.199.
X-Git-Tag: debian/2.0.15-1~167
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=24b9fd1c70013f5847d3a4658e56bd44534e7890;p=live-boot-grml.git

Merging casper 1.199.
---

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