From 234eb49696ce11fe387df786b23a159074c32e9b Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Mon, 2 Jul 2012 17:54:58 +0200
Subject: Splitting out already reviewed swapon script.

---
 scripts/boot/3020-swapon    | 48 +++++++++++++++++++++++++++++++++++++++++++++
 scripts/boot/9990-swapon.sh | 48 ---------------------------------------------
 2 files changed, 48 insertions(+), 48 deletions(-)
 create mode 100755 scripts/boot/3020-swapon
 delete mode 100755 scripts/boot/9990-swapon.sh

(limited to 'scripts')

diff --git a/scripts/boot/3020-swapon b/scripts/boot/3020-swapon
new file mode 100755
index 0000000..158d81b
--- /dev/null
+++ b/scripts/boot/3020-swapon
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+#set -e
+
+Swapon ()
+{
+	_DEVICES="/dev/sd* /dev/vd*"
+
+	if [ -e /run ]
+	then
+		# wheezy
+		_FSTAB="/root/etc/fstab.d/swap"
+	else
+		# squeeze
+		_FSTAB="/root/etc/fstab"
+	fi
+
+	for _DEVICE in ${_DEVICES}
+	do
+		if [ ! -b "${_DEVICE}" ]
+		then
+			continue
+		fi
+
+		blkid -o udev -p ${_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
+
+		case "${_MAGIC}" in
+			SWAPSPACE2|SWAP-SPACE)
+				_SWAP_DEVICES="${_SWAP_DEVICES} ${_DEVICE}"
+				;;
+		esac
+	done
+
+	# Remove all auto swap entries
+	if grep -qs "swap swap" "${_FSTAB}"
+	then
+		grep -v "swap swap" "${_FSTAB}" > "${_FSTAB}".tmp
+		mv "${_FSTAB}".tmp "${_FSTAB}"
+	fi
+
+	# Add new swap entries
+	for _DEVICE in _SWAP_DEVICES
+	do
+		echo "${_DEVICE} swap swap defaults 0 0" >> "${_FSTAB}"
+	done
+}
diff --git a/scripts/boot/9990-swapon.sh b/scripts/boot/9990-swapon.sh
deleted file mode 100755
index 158d81b..0000000
--- a/scripts/boot/9990-swapon.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-Swapon ()
-{
-	_DEVICES="/dev/sd* /dev/vd*"
-
-	if [ -e /run ]
-	then
-		# wheezy
-		_FSTAB="/root/etc/fstab.d/swap"
-	else
-		# squeeze
-		_FSTAB="/root/etc/fstab"
-	fi
-
-	for _DEVICE in ${_DEVICES}
-	do
-		if [ ! -b "${_DEVICE}" ]
-		then
-			continue
-		fi
-
-		blkid -o udev -p ${_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
-
-		case "${_MAGIC}" in
-			SWAPSPACE2|SWAP-SPACE)
-				_SWAP_DEVICES="${_SWAP_DEVICES} ${_DEVICE}"
-				;;
-		esac
-	done
-
-	# Remove all auto swap entries
-	if grep -qs "swap swap" "${_FSTAB}"
-	then
-		grep -v "swap swap" "${_FSTAB}" > "${_FSTAB}".tmp
-		mv "${_FSTAB}".tmp "${_FSTAB}"
-	fi
-
-	# Add new swap entries
-	for _DEVICE in _SWAP_DEVICES
-	do
-		echo "${_DEVICE} swap swap defaults 0 0" >> "${_FSTAB}"
-	done
-}
-- 
cgit v1.2.3