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.91.4.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
13swap
diff --git
a/scripts/live-bottom/13swap
b/scripts/live-bottom/13swap
index
4f6be9d
..
8b47a00
100755
(executable)
--- a/
scripts/live-bottom/13swap
+++ b/
scripts/live-bottom/13swap
@@
-20,6
+20,11
@@
esac
# live-initramfs header
# live-initramfs header
+if [ -n "${NOSWAP}" ]
+then
+ exit 0
+fi
+
. /scripts/live-functions
log_begin_msg "Setting up swap..."
. /scripts/live-functions
log_begin_msg "Setting up swap..."
@@
-28,11
+33,6
@@
log_begin_msg "Setting up swap..."
FSTAB=/root/etc/fstab
FSTAB=/root/etc/fstab
-if [ -n "${NOSWAP}" ]
-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