summaryrefslogtreecommitdiff
path: root/scripts/live
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-07-14 09:49:10 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:00 +0100
commit8225101cbf7a069f0d4ff6d5fda4677051d8821a (patch)
tree60f48b92739b4b5d0a3ba29364466426bfe2633e /scripts/live
parentd093a29808026e9591542ba89a56db3ef30c90df (diff)
downloadlive-boot-8225101cbf7a069f0d4ff6d5fda4677051d8821a.tar.gz
live-boot-8225101cbf7a069f0d4ff6d5fda4677051d8821a.zip
Merging casper version 1.133.
Diffstat (limited to 'scripts/live')
-rwxr-xr-xscripts/live12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/live b/scripts/live
index b886f47..bf30b50 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1192,12 +1192,6 @@ check_dev ()
devname=$(sys2dev "${sysdev}")
fi
- if [ -n "${LIVE_MEDIA_OFFSET}" ]
- then
- loopdevname=$(setup_loop "${devname}" "loop" "/sys/block/loop*" "${LIVE_MEDIA_OFFSET}" '')
- devname="${loopdevname}"
- fi
-
if [ -d "${devname}" ]
then
mount -o bind "${devname}" $mountpoint || continue
@@ -1211,6 +1205,12 @@ check_dev ()
fi
fi
+ if [ -n "${LIVE_MEDIA_OFFSET}" ]
+ then
+ loopdevname=$(setup_loop "${devname}" "loop" "/sys/block/loop*" "${LIVE_MEDIA_OFFSET}" '')
+ devname="${loopdevname}"
+ fi
+
fstype=$(get_fstype "${devname}")
if is_supported_fs ${fstype}