Merge ~smoser/cloud-initramfs-tools:fix/1834875-growpart-add-flock-depend into cloud-initramfs-tools:master

[Scott Moser]

Add dependency on flock for growroot's use of growpart.

growpart was modified to use flock, so we have to make sure that
that gets put into the initramfs or growroot module won't work.

LP: #1834875

see commit message

[Ryan Harper (raharper)]

LGTM! Thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 199391a..a9c6a6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
-cloud-initramfs-tools (0.43ubuntu2) UNRELEASED; urgency=medium
+cloud-initramfs-tools (0.45ubuntu1) UNRELEASED; urgency=medium
+
+  * Add dependency on flock for growroot's use of growpart.
+    (LP: #1834875)
+
+ -- Scott Moser <[e-mail]>  Mon, 24 Feb 2020 20:22:30 -0500
+
+cloud-initramfs-tools (0.44ubuntu1) disco; urgency=medium
 
   [ Dann Frazier ]
   * copymods: Fix usage of modules in initramfs after copymods script.
     (LP: #1766723)
   * copymods: Fix typo parsing copymods= parameters in /proc/cmdline.
 
- -- Scott Moser <[e-mail]>  Wed, 07 Nov 2018 09:41:13 -0500
+ -- Scott Moser <[e-mail]>  Tue, 13 Nov 2018 10:09:46 -0500
 
 cloud-initramfs-tools (0.43ubuntu1) cosmic; urgency=medium
 
diff --git a/growroot/hooks/growroot b/growroot/hooks/growroot
index 9eba6c2..8e012cb 100644
--- a/growroot/hooks/growroot
+++ b/growroot/hooks/growroot
@@ -9,7 +9,7 @@ esac
 . /usr/share/initramfs-tools/hook-functions
 
 ##
-for pname in sfdisk growpart udevadm; do
+for pname in sfdisk growpart udevadm flock; do
     fpath=$(which "$pname") && copy_exec "$fpath" ||
         { echo "ERROR: no '$pname' in path" 1>&2; exit 1; }
 done