projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding upstream version 1.87.3.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
13swap
diff --git
a/scripts/live-bottom/13swap
b/scripts/live-bottom/13swap
index
fcef76c
..
9d762f4
100755
(executable)
--- a/
scripts/live-bottom/13swap
+++ b/
scripts/live-bottom/13swap
@@
-21,6
+21,11
@@
esac
log_begin_msg "$DESCRIPTION"
log_begin_msg "$DESCRIPTION"
+if [ -n "${SWAPOFF}" ]
+then
+ exit 0
+fi
+
devices=""
for device in /dev/[hs]d[a-z][0-9]*; do
if ! [ -b "$device" ]; then
devices=""
for device in /dev/[hs]d[a-z][0-9]*; do
if ! [ -b "$device" ]; then
@@
-28,7
+33,7
@@
for device in /dev/[hs]d[a-z][0-9]*; do
fi
magic=$(/bin/dd if="$device" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue
fi
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" ]; then
# log "Found $device"
devices="$devices $device"
if [ "$magic" = "SWAPSPACE2" -o "$magic" = "SWAP-SPACE" ]; then
# log "Found $device"
devices="$devices $device"