projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging casper 1.148.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
13swap
diff --git
a/scripts/live-bottom/13swap
b/scripts/live-bottom/13swap
index
303fbbb
..
8fc718c
100755
(executable)
--- a/
scripts/live-bottom/13swap
+++ b/
scripts/live-bottom/13swap
@@
-20,14
+20,14
@@
esac
# live-initramfs header
# live-initramfs header
-if [ -
n "${NOSWAP
}" ] || [ -n "${NOFSTAB}" ]
+if [ -
z "${SWAPON
}" ] || [ -n "${NOFSTAB}" ]
then
exit 0
fi
. /scripts/live-functions
then
exit 0
fi
. /scripts/live-functions
-log_begin_msg "Setting up swap
...
"
+log_begin_msg "Setting up swap"
# live-initramfs script
# live-initramfs script
@@
-41,7
+41,7
@@
do
continue
fi
continue
fi
- /lib/udev/vol_id ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue
+ /lib/udev/vol_id ${device%%[0-9]*}
2>/dev/null
| 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
magic=$(/bin/dd if="${device}" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue