[SCM] debian-live branch, master, updated. 1.130.1-3-5-g0d7bd3e

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 0d7bd3e17ea8f54d8413454fcdd598778bb2a624
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat May 31 10:02:33 2008 +0200

    Ignore floppy devices for live filesystem as well as live persistence.

diff --git a/scripts/live b/scripts/live
index 95c4c6b..867d4f9 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1211,7 +1211,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-')
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v 'dm-' | grep -v fd )
 	do
 		devname=$(sys2dev "${sysblock}")
 		fstype=$(get_fstype "${devname}")
diff --git a/scripts/live-helpers b/scripts/live-helpers
index b0ad4b6..3c89c95 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 | grep -v ram)
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
 	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 | grep -v ram)
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
 	do
 		for dev in $(subdevices "${sysblock}")
 		do

-- 
debian-live