[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. d01a461083d18e8fd08fae1ec658b2086a9b6cb5

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 98ea43da4f99b6e9a189c3bd2a7fc20e2866a911
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Mar 8 19:58:04 2009 +0100

    calling mkswap for swap partitions

diff --git a/install.sh b/install.sh
index 33168b6..126d0fb 100755
--- a/install.sh
+++ b/install.sh
@@ -425,7 +425,7 @@ action_testing () {
 	fi
 	echo " * microSD card device: $SD_DEVICE present"
 
-	for BINARY in wget ping fdisk mount umount mkfs.$SD_PART1_FS mkfs.$SD_PART2_FS gunzip dd sed rdate; do
+	for BINARY in wget ping fdisk mount umount mkfs.$SD_PART1_FS mkfs.$SD_PART2_FS mkswap gunzip dd sed rdate; do
 		if ! which $BINARY > /dev/null; then
 			echo "E: Could not find $BINARY binary"
 			exit 1
@@ -632,9 +632,17 @@ action_format () {
 	echo " * Formatting the microSD card partitions"
 	if [ "$SINGLE_PART" = "true" ]; then
 		mkfs.ext2 ${SD_DEVICE}p1
+		if [ -n "$SD_SWAP_SIZE" ]; then
+			echo " * Formatting swap on ${SD_DEVICE}p2"
+			mkswap ${SD_DEVICE}p2
+		fi
 	else
 		mkfs.$SD_PART1_FS ${SD_DEVICE}p1
 		mkfs.$SD_PART2_FS ${SD_DEVICE}p2
+		if [ -n "$SD_SWAP_SIZE" ]; then
+			echo " * Formatting swap on ${SD_DEVICE}p3"
+			mkswap ${SD_DEVICE}p3
+		fi
 	fi
 
 	echo "I: microSD card ready"

-- 
Various non-packaged files