summaryrefslogtreecommitdiff
path: root/scripts/live-bottom
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-bottom
parentd093a29808026e9591542ba89a56db3ef30c90df (diff)
downloadlive-boot-8225101cbf7a069f0d4ff6d5fda4677051d8821a.tar.gz
live-boot-8225101cbf7a069f0d4ff6d5fda4677051d8821a.zip
Merging casper version 1.133.
Diffstat (limited to 'scripts/live-bottom')
-rwxr-xr-xscripts/live-bottom/13swap2
1 files changed, 2 insertions, 0 deletions
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" ]