Merge ~paride/+git/cloud-utils:ubuntu/devel into ~paride/+git/cloud-utils:ubuntu/0.32-18-g5b59de87-0ubuntu1

[Paride Legovini]

MP to ease review and sponsorship of a new snapshot of cloud-utils. The branch has already been reviewed on GitHub by tableflip [1], so this should be good to be uploaded. To generate the upstream tarball do:

  git deborig 45fe84a57724dc4b2e261d6f7d1831c8b01b2069

Note: the target branch is what we have in Impish right now.

Thanks!

[1] https://github.com/canonical/cloud-utils/pull/32

[Paride Legovini (paride)]

Requested review from canonical-server-core-reviewers as cloud-utils is not in the 'server' packageset. It's in the 'cloud' packageset, but we don't have team members there anymore.

[Christian Ehrhardt  (paelzer)]

grabbing this one ...

[Christian Ehrhardt  (paelzer)]

your base is equivalent
$ git diff paride/ubuntu/0.32-18-g5b59de87-0ubuntu1..pkg/import/0.32-18-g5b59de87-0ubuntu1
<nothing>

[Christian Ehrhardt  (paelzer)]

And your picks into packaging match upstreams history
$ git range-diff 5b59de87d61432442883a8181b0d8999fe6285d4..45fe84a57724dc4b2e261d6f7d1831c8b01b2069 fd528cd597b3df17f0db2bb34a5ef0f90e41f031..45fe84a57724dc4b2e261d6f7d1831c8b01b2069
1: 3cde834 = 1: 3cde834 growpart: Use LANG=C to parse sfdisk output
2: af546af = 2: af546af growpart: change flock call to use short option for Busybox compatibility
3: 03aa997 = 3: 03aa997 Fix issue LP: #1928167 growpart doesn't work when LANG=cs_CZ.UTF-8
4: 45fe84a = 4: 45fe84a Merge test changes from test-growpart to test-growpart-lvm

[Christian Ehrhardt  (paelzer)]

Changelog entries are ok to represent this kind of merge-from-upstream, but references are correct as well.

[Christian Ehrhardt  (paelzer)]

I think this is mostly fine, but on the packaging side I have one nit pick
  Maintainer: Scott Moser <email address hidden>
no more is correct.
Do you want to set yourself Paride or a team with an email address?

review: Needs Information

[Christian Ehrhardt  (paelzer)]

I've compared the git diff (to the latest version) to a debdiff of this build vs the one in the archive. It is a full match so there is no forgotten little detail.

[Paride Legovini (paride)]

Thanks for reviewing Christian! I agree the Maintainer is now outdated, and my proposal is to set it to the standard "Ubuntu Developers" value. We have the same in cloud-init:

  Maintainer: Ubuntu Developers <email address hidden>

so I think it's reasonable to have the same on cloud-utils. I submitted a PR for this:

  https://github.com/canonical/cloud-utils/pull/33

However if that's OK for let's upload with the Maintainer as it is for now, saving us some review rounds (the above PR + the merge to the packaging branch + your review for the sponsorship). Once that lands the next upload will have the updated Maintainer.

[Utkarsh Gupta (utkarsh)]

+1, having Ubuntu Developers as the maintainer is better than having an individual person, et al. And that PR makes sense, approving that and merging on GitHub.

[Christian Ehrhardt  (paelzer)]

That is fine with me, @paride would you merge that into your proposed branch - then we can sponsor.

[Paride Legovini (paride)]

Merged. Now the branch name is bad as it doesn't reflect the package version it contains, but no big deal as it's not published anywhere. I'll chose a better name next time.

[Christian Ehrhardt  (paelzer)]

LGTM now, sponsoring

review: Approve

[Christian Ehrhardt  (paelzer)]

Did another debdiff check, upload look like what we want.
Uploaded

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading cloud-utils_0.32-22-g45fe84a5-0ubuntu1.dsc: done.
  Uploading cloud-utils_0.32-22-g45fe84a5.orig.tar.xz: done.
  Uploading cloud-utils_0.32-22-g45fe84a5-0ubuntu1.debian.tar.xz: done.
  Uploading cloud-utils_0.32-22-g45fe84a5-0ubuntu1_source.buildinfo: done.
  Uploading cloud-utils_0.32-22-g45fe84a5-0ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/bin/growpart b/bin/growpart
index 994b258..541b4ab 100755
--- a/bin/growpart
+++ b/bin/growpart
@@ -162,7 +162,7 @@ lock_disk() {
 	# Do not use --nonblock or --timeout as udev may be already processing
 	# the disk and we must wait until it has released the disk to
 	# proceed.  Failure to obtain exclusive lock is fatal to growpart.
-	rq flock flock --exclusive $FLOCK_DISK_FD ||
+	rq flock flock -x $FLOCK_DISK_FD ||
 		fail "Error while obtaining exclusive lock on $DISK"
 	debug 1 "FLOCK: $disk: obtained exclusive lock"
 }
@@ -230,7 +230,7 @@ get_sfdisk_version() {
 		return 0
 	}
 	# expected output: sfdisk from util-linux 2.25.2
-	out=$(sfdisk --version) ||
+	out=$(LANG=C sfdisk --version) ||
 		{ error "failed to get sfdisk version"; return 1; }
 	set -- $out
 	ver=$4
@@ -292,7 +292,7 @@ resize_sfdisk() {
 	local pt_start pt_size pt_end max_end new_size change_info dpart
 	local sector_num sector_size disk_size tot out
 
-	rqe sfd_list sfdisk --list --unit=S "$DISK" >"$tmp" ||
+	LANG=C rqe sfd_list sfdisk --list --unit=S "$DISK" >"$tmp" ||
 		fail "failed: sfdisk --list $DISK"
 	if [ "${SFDISK_VERSION}" -lt ${SFDISK_2_26} ]; then
 		# exected output contains: Units: sectors of 512 bytes, ...
diff --git a/debian/changelog b/debian/changelog
index 7c66aea..c2ae5df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+cloud-utils (0.32-22-g45fe84a5-0ubuntu1) impish; urgency=medium
+
+  * New upstream snapshot.
+    - Merge test changes from test-growpart to test-growpart-lvm
+      [Dan Bungert] (LP: #1929885)
+    - Fix issue LP: #1928167 growpart doesn't work when LANG=cs_CZ.UTF-8
+      [Amy Chen]
+    - growpart: change flock call to use short option for Busybox
+      compatibility [Dermot Bradley]
+    - growpart: Use LANG=C to parse sfdisk output [Nicolas Chauvet]
+      (LP: #1860479)
+
+ -- Paride Legovini <[e-mail]>  Thu, 05 Aug 2021 11:58:37 +0200
+
 cloud-utils (0.32-18-g5b59de87-0ubuntu1) hirsute; urgency=medium
 
   * New upstream snapshot.
diff --git a/test/test-growpart-lvm b/test/test-growpart-lvm
index b8f38dc..e0f1686 100755
--- a/test/test-growpart-lvm
+++ b/test/test-growpart-lvm
@@ -34,25 +34,10 @@ rq() {
 	"$@" > "$out" 2>&1 || { echo "FAILED:" "$@"; cat "$out"; return 1; }
 }
 
-clearparts() {
-	# read /proc/partitions, clearing any partitions on dev (/dev/loopX)
-	local dev="$1"
-	local short=${dev##*/} parts="" part=""
-	parts=$(awk '$4 ~ m { sub(m,"",$4); print $4 }' \
-		"m=${short}p" /proc/partitions)
-	[ -z "$parts" ] && return
-	echo "clearing parts [$parts] from $dev"
-	for part in $parts; do
-		echo "delpart $LODEV $part"
-		delpart $LODEV $part
-	done
-	udevadm settle
-}
 cleanup() {
 	if [ -n "$MP" ]; then
 		echo "unmount $MP";
 		umount "$MP";
-		udevadm settle
 	fi
 	if [ -n "$VG" ]; then
 		echo "removing vg $VG"
@@ -61,13 +46,10 @@ cleanup() {
 	if [ -n "$PV" ]; then
 		echo "removing pv $PV"
 		rq lvm pvremove --force --yes "$PV"
-		udevadm settle
 	fi
 	if [ -n "$LODEV" ]; then
-		clearparts "$LODEV"
 		echo "losetup --detach $LODEV";
 		losetup --detach "$LODEV";
-		udevadm settle
 	fi
 	[ ! -d "${TEMP_D}" ] || rm -Rf "${TEMP_D}"
 }
@@ -104,13 +86,10 @@ echo "2048," | rq sfdisk $label_flag --force --unit=S "$img"
 
 truncate --size "$size" "$img"
 
-lodev=$(losetup --show --find "$img")
+lodev=$(losetup --show --find --partscan "$img")
 LODEV=$lodev
+udevadm settle
 echo "set up $lodev"
-
-# clear any old ones that might be around (LP: #1136781)
-clearparts "$lodev"
-partx --add $lodev
 lodevpart="${lodev}p1"
 
 vg="testvg-$$"