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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit a48a7f310e4cf2c30cf8e80d0a9603295a7779ee
Author: Steffen Moeller <moeller at debian.org>
Date:   Tue Dec 1 01:08:22 2009 +0100

    Sending fdisk "p\nq" rather than the plain "pq"
    
    Thanks go to Charles Tabor to spotting this.

diff --git a/install.sh b/install.sh
index ac9692c..6ad25be 100755
--- a/install.sh
+++ b/install.sh
@@ -716,13 +716,13 @@ action_partition () {
 	mb=$(( $(cat /sys/block/mmcblk0/size) * 8 / 15625 ))
 	# If one were willing to assume that cylinders are always 64 * 512, then we could calculate the
 	# next line thus:   $(( $(cat /sys/block/mmcblk0/size) / 64 ))
-	cylinders=$(echo pq | fdisk ${SD_DEVICE} | grep cylinders|grep heads|cut -f 5 -d\ )
+	cylinders=$(echo -e "p\nq" | fdisk ${SD_DEVICE} | grep cylinders|grep heads|cut -f 5 -d\ )
 	lastcylinder=$(($cylinders-($cylinders*$SD_SWAP_SIZE/$mb)))
 
 ##### TODO: Evaluate the suggestion by x
 #+#	mb=$(echo pq | fdisk /dev/mmcblk0 | grep Disk | cut -f 3 -d \ )
 #+	mb=$(sfdisk -s ${SD_DEVICE} 2>/dev/null)
-#+#	cylinders=$(echo pq | fdisk /dev/mmcblk0 | grep cylinders | grep heads | cut -f 5 -d\ )
+#+#	cylinders=$(echo -e "p\nq" | fdisk /dev/mmcblk0 | grep cylinders | grep heads | cut -f 5 -d\ )
 #+	cylinders=$(sfdisk -G ${SD_DEVICE} 2>/dev/null | grep "^${SD_DEVICE}" | awk "{ print \$2 }")
 #+	lastcylinder=$(($cylinders-($cylinders*$SD_SWAP_SIZE/($mb/1024))))
 #
@@ -789,7 +789,7 @@ EOSWAPCONF
 		echo "Partitioning was successful."
 		if [ -n "$VERBOSE" ]; then
 			echo "The following partitions have been created:"
-			echo "pq" | fdisk $SD_DEVICE
+			echo -e "p\nq" | fdisk $SD_DEVICE
 		fi
 		#rm /tmp/argsToFdisk$$
 	else

-- 
Various non-packaged files