cloud-init

Merge lp:~dazworrall/cloud-init/lp1507526 into lp:~cloud-init-dev/cloud-init/trunk

  1. lp1507526
  2. Merge into trunk
Proposed by Darren Worrall
Status: Merged
Merged at revision: 1150
Proposed branch: lp:~dazworrall/cloud-init/lp1507526
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
cloudinit/sources/DataSourceAltCloud.py (+1/-1)
To merge this branch: bzr merge lp:~dazworrall/cloud-init/lp1507526
Reviewer Review Type Date Requested Status
Dan Watkins Approve
Review via email: mp+274981@code.launchpad.net

Description of the change

Removes the --quiet option from udevadm, which is no longer supported.

To post a comment you must log in.
Revision history for this message
Dan Watkins (oddbloke) wrote :

Thanks Darren!

Revision history for this message
Dan Watkins (oddbloke) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cloudinit/sources/DataSourceAltCloud.py'
2--- cloudinit/sources/DataSourceAltCloud.py 2015-01-26 22:05:21 +0000
3+++ cloudinit/sources/DataSourceAltCloud.py 2015-10-20 08:49:06 +0000
4@@ -41,7 +41,7 @@
5
6 # Shell command lists
7 CMD_PROBE_FLOPPY = ['/sbin/modprobe', 'floppy']
8-CMD_UDEVADM_SETTLE = ['/sbin/udevadm', 'settle', '--quiet', '--timeout=5']
9+CMD_UDEVADM_SETTLE = ['/sbin/udevadm', 'settle', '--timeout=5']
10
11 META_DATA_NOT_SUPPORTED = {
12 'block-device-mapping': {},