From 9a8db8afc8096b5239f8051dfe372b3c21c9d114 Mon Sep 17 00:00:00 2001
From: Andrew Jenkins <andrewj@f5.com>
Date: Fri, 10 Jun 2016 15:30:22 -0600
Subject: [PATCH] Build images on ubuntu 16.04

Ubuntu 16.04 behaves slightly differently than 14.04.  pvscan will not
activate the /dev/nbd* devices unless told specifically to examine and
activate them using "--cache".

Add some robustness by doing a partprobe after qemu-nbd but before using
the partitions.  This helps races (the partprobe happens asynchronously
I think).
---
 bin/patch-image.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/bin/patch-image.sh b/bin/patch-image.sh
index f30f80a..ad5cbfe 100644
--- a/bin/patch-image.sh
+++ b/bin/patch-image.sh
@@ -205,6 +205,7 @@ function check_oldfile_full_path() {
 temp_dir="$HOME/.f5-image-prep/tmp"
 userdata_file='none'
 firstboot_file=false
+qcow_device=/dev/nbd0
 
 function badusage {
     echo "usage: patch-image -s startup_pkg -f -u userdata_file <image.qcow2>"
@@ -309,10 +310,14 @@ fi
 check_oldfile_full_path
 
 sleep 2
-qemu-nbd -d /dev/nbd0
+qemu-nbd -d $qcow_device
 sleep 2
-qemu-nbd --connect=/dev/nbd0 $temp_dir/$newfile
+qemu-nbd --connect=$qcow_device $temp_dir/$newfile
 sleep 2
+partprobe $qcow_device
+for part in ${qcow_device}*; do
+  pvscan --cache $part
+done
 pvscan
 sleep 2
 echo "The following command may cause 'Can't deactivate' messages."
@@ -345,6 +350,6 @@ fi
 sleep 2
 vgchange -an
 sleep 2
-qemu-nbd -d /dev/nbd0
+qemu-nbd -d $qcow_device
 echo "Patched image located at $temp_dir/$newfile"
 set +x