[SCM] debian-live/live-initramfs branch, master, updated. 1.125.1-1-7-g39f6aa4

[Chris Lamb]

The following commit has been merged in the master branch:
commit 01c058636c0bb071a451a14faafa9c99bc41a426
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Wed Mar 26 08:09:57 2008 +0000

    scripts/live-helpers: Don't search ram block devices
    
    We are hardly likely to find persistent-related devices on RAM disks, so
    we ignore them whilst searching.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 6c03751..b0ad4b6 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -234,7 +234,7 @@ find_cow_device ()
 	pers_label="${1}"
 	cow_backing="/${pers_label}-backing"
 
-	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop)
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram)
 	do
 		for dev in $(subdevices "${sysblock}")
 		do
@@ -274,7 +274,7 @@ find_files ()
 	filenames="${1}"
 	snap_backing="/snap-backing"
 
-	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop)
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram)
 	do
 		for dev in $(subdevices "${sysblock}")
 		do

-- 
debian-live/live-initramfs