cloud-init-dev team mailing list archive

[Paul Meyer <paul.meyer@xxxxxxxxxxxxx>]

Paul Meyer has proposed merging ~paul-meyer/cloud-init:paulmey/fix-fs-setup into cloud-init:master.

Requested reviews:
  cloud-init commiters (cloud-init-dev)
Related bugs:
  Bug #1692093 in cloud-init: "Cloud init is re-executing fs and disk setup during reboot"
  https://bugs.launchpad.net/cloud-init/+bug/1692093

For more details, see:
https://code.launchpad.net/~paul-meyer/cloud-init/+git/cloud-init/+merge/324359
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~paul-meyer/cloud-init:paulmey/fix-fs-setup into cloud-init:master.

diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py
index 29eb5dd..5cefcd1 100644
--- a/cloudinit/config/cc_disk_setup.py
+++ b/cloudinit/config/cc_disk_setup.py
@@ -242,12 +242,14 @@ def enumerate_disk(device, nodeps=False):
 
     lsblk_cmd = [LSBLK_CMD, '--pairs', '--output', 'NAME,TYPE,FSTYPE,LABEL',
                  device]
+    udev_cmd = [UDEVADM_CMD, 'settle']
 
     if nodeps:
         lsblk_cmd.append('--nodeps')
 
     info = None
     try:
+        util.subp(udev_cmd)
         info, _err = util.subp(lsblk_cmd)
     except Exception as e:
         raise Exception("Failed during disk check for %s\n%s" % (device, e))