Ignoring floppy devices for live filesystem as well as live persistency.

diff --git a/scripts/live b/scripts/live
index 95c4c6b..867d4f9 100755 (executable)
--- 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 (file)
--- 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