Merge lp:~smoser/cloud-utils/trunk.1762748-gpt-big-disks into lp:cloud-utils

[Scott Moser]

growpart: fix bug that stopped GPT disks from being grown past 2TB.

MBR max size was being applied to GPT partitioned disks.
The change here is to only apply the mbr max (and only WARN about the limit)
if the format is MBR.

[lp:~smoser/cloud-utils/trunk.1762748-gpt-big-disks]

324. By Scott Moser on 2018-04-13

test/test-growpart: adjust to allow for reading sizes from environment.

this allows recreate and easier size/test with:
  sudo PATH=./bin:$PATH PT_TYPE=gpt \
     DISK_SIZE_NEW=5T DISK_SIZE_ORIG=1T ./test/test-growpart

=== modified file 'bin/growpart'
--- bin/growpart	2016-09-01 17:46:40 +0000
+++ bin/growpart	2018-04-13 03:23:49 +0000
@@ -244,8 +244,6 @@
 	fi
 
 	debug 1 "$sector_num sectors of $sector_size. total size=${disk_size} bytes"
-	[ $(($disk_size/512)) -gt $mbr_max_512 ] &&
-		debug 1 "WARN: disk is larger than 2TB. additional space will go unused."
 
 	rqe sfd_dump sfdisk --unit=S --dump "${DISK}" >"${dump_out}" ||
 		fail "failed to dump sfdisk info for ${DISK}"
@@ -289,17 +287,21 @@
 		[ -n "${max_end}" ] ||
 		fail "failed to get max_end for partition ${PART}"
 
-	mbr_max_sectors=$((mbr_max_512*$((sector_size/512))))
-	if [ "$max_end" -gt "$mbr_max_sectors" ]; then
-		max_end=$mbr_max_sectors
-	fi
-
 	if [ "$format" = "gpt" ]; then
 		# sfdisk respects 'last-lba' in input, and complains about
 		# partitions that go past that.  without it, it does the right thing.
 		sed -i '/^last-lba:/d' "$dump_out" ||
 			fail "failed to remove last-lba from output"
 	fi
+	if [ "$format" = "mbr" ]; then
+		mbr_max_sectors=$((mbr_max_512*$((sector_size/512))))
+		if [ "$max_end" -gt "$mbr_max_sectors" ]; then
+			max_end=$mbr_max_sectors
+		fi
+		[ $(($disk_size/512)) -gt $mbr_max_512 ] &&
+			debug 1 "WARN: disk is larger than 2TB." \
+				"additional space will go unused."
+	fi
 
 	local gpt_second_size="33"
 	if [ "${max_end}" -gt "$((${sector_num}-${gpt_second_size}))" ]; then
 
=== modified file 'test/test-growpart'
--- test/test-growpart	2016-09-01 19:29:00 +0000
+++ test/test-growpart	2018-04-13 03:23:49 +0000
@@ -5,7 +5,10 @@
 [ "$(id -u)" = "0" ] ||
 	{ echo "sorry, must be root"; exit 1; }
 
-PT_TYPE="${PT_TYPE:-dos}" # dos or gpt or sfdisk-gpt
+PT_TYPE="${PT_TYPE:-dos}" # dos or gpt
+size=${DISK_SIZE_NEW:-1000M}
+osize=${DISK_SIZE_ORIG:-500M}
+
 MP=""
 LODEV=""
 TEMP_D=""
@@ -43,15 +46,15 @@
 img="${TEMP_D}/disk.img"
 mp="${TEMP_D}/mp"
 
-size=1000M
-osize=500M
+echo "Partitioning $PT_TYPE orig_size=$osize grow_size=$size."
+echo "growpart is $(which growpart)"
 rm -f $img
 [ ! -e $mp ] || rmdir $mp || { echo "failed rmdir $mp"; exit 1; }
 mkdir $mp
 
 truncate --size $osize "$img"
 
-label_flag="--label=${PT_TYPE:-dos}"
+label_flag="--label=${PT_TYPE}"
 echo "2048," | rq sfdisk $label_flag --force --unit=S "$img"
 
 truncate --size "$size" "$img"