diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live | 12 | ||||
| -rwxr-xr-x | scripts/live-bottom/13swap | 2 |
2 files changed, 8 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} diff --git a/scripts/live-bottom/13swap b/scripts/live-bottom/13swap index f3af1cc..303fbbb 100755 --- a/scripts/live-bottom/13swap +++ b/scripts/live-bottom/13swap @@ -41,6 +41,8 @@ do continue fi + /lib/udev/vol_id ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue + magic=$(/bin/dd if="${device}" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue if [ "${magic}" = "SWAPSPACE2" -o "${magic}" = "SWAP-SPACE" ] |