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

[Joachim Breitner]

The following commit has been merged in the master branch:
commit 34c0be68bdfde2cd183cbbdb7624e4c945741af7
Author: Tiago Bortoletto Vaz <tiago at debian-ba.org>
Date:   Thu Aug 20 00:47:52 2009 +0200

    Robuster parsing of fdisk ${SD_DEVICE} output

diff --git a/install.sh b/install.sh
index 84a2d0d..2c4357e 100755
--- a/install.sh
+++ b/install.sh
@@ -634,7 +634,7 @@ action_partition () {
 
 	if [ -z "$SD_SWAP_SIZE" ]; then SD_SWAP_SIZE=0; fi
 
-	mb=$(echo pq | fdisk ${SD_DEVICE} | grep Disk| cut -f 3 -d \ )
+	mb=$(echo pq | fdisk ${SD_DEVICE} | grep -m1 Disk | cut -f 3 -d \ )
 	cylinders=$(echo pq | fdisk ${SD_DEVICE} | grep cylinders|grep heads|cut -f 5 -d\ )
 	lastcylinder=$(($cylinders-($cylinders*$SD_SWAP_SIZE/$mb)))
 

-- 
Various non-packaged files