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
fcef76c
..
8b47a00
100755
(executable)
--- a/
scripts/live-bottom/13swap
+++ b/
scripts/live-bottom/13swap
@@
-1,25
+1,37
@@
#!/bin/sh
#!/bin/sh
-PREREQ=""
-DESCRIPTION="Setting up swap..."
-FSTAB=/root/etc/fstab
+#set -e
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
prereqs()
{
prereqs()
{
- echo "$
PREREQ
"
+ echo "$
{PREREQ}
"
}
}
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
+case "${1}" in
+ prereqs)
+ prereqs
+ exit 0
+ ;;
esac
esac
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
+
+if [ -n "${NOSWAP}" ]
+then
+ exit 0
+fi
+
+. /scripts/live-functions
+
+log_begin_msg "Setting up swap..."
+
+# live-initramfs script
+
+FSTAB=/root/etc/fstab
devices=""
for device in /dev/[hs]d[a-z][0-9]*; do
devices=""
for device in /dev/[hs]d[a-z][0-9]*; do
@@
-28,7
+40,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"