summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-05-31 10:05:35 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:47:59 +0100
commit08f73f92a5006dae43f67458c062657574aacac6 (patch)
treeb7e8fbba01b817b0dccf643bcc2d065cd2f0914e /scripts
parent770a8001e5b407910f2de38fbc5852c4356d05f0 (diff)
downloadlive-boot-08f73f92a5006dae43f67458c062657574aacac6.tar.gz
live-boot-08f73f92a5006dae43f67458c062657574aacac6.zip
Ignoring floppy devices for live filesystem as well as live persistency.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/live2
-rw-r--r--scripts/live-helpers4
2 files changed, 3 insertions, 3 deletions
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