diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-04 01:55:28 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-04 01:55:28 -0500 |
| commit | 1a9a408a7bf6d7a1a06254ad2939bd549acba69b (patch) | |
| tree | ec4f76ea5260e269c83addbfafa4376ea2678059 /cloudinit/config/cc_grub_dpkg.py | |
| parent | bbf105baafbe788f7babbda188b513180424e256 (diff) | |
| parent | 8092805079d011093724d87e9485e5bf79479a72 (diff) | |
| download | vyos-cloud-init-1a9a408a7bf6d7a1a06254ad2939bd549acba69b.tar.gz vyos-cloud-init-1a9a408a7bf6d7a1a06254ad2939bd549acba69b.zip | |
merge with trunk
Diffstat (limited to 'cloudinit/config/cc_grub_dpkg.py')
| -rw-r--r-- | cloudinit/config/cc_grub_dpkg.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cloudinit/config/cc_grub_dpkg.py b/cloudinit/config/cc_grub_dpkg.py index 456597af..3c2d9985 100644 --- a/cloudinit/config/cc_grub_dpkg.py +++ b/cloudinit/config/cc_grub_dpkg.py @@ -37,12 +37,11 @@ def handle(name, cfg, _cloud, log, _args): return idevs = util.get_cfg_option_str(mycfg, "grub-pc/install_devices", None) - idevs_empty = util.get_cfg_option_str(mycfg, - "grub-pc/install_devices_empty", None) + idevs_empty = util.get_cfg_option_str( + mycfg, "grub-pc/install_devices_empty", None) if ((os.path.exists("/dev/sda1") and not os.path.exists("/dev/sda")) or - (os.path.exists("/dev/xvda1") - and not os.path.exists("/dev/xvda"))): + (os.path.exists("/dev/xvda1") and not os.path.exists("/dev/xvda"))): if idevs is None: idevs = "" if idevs_empty is None: @@ -66,7 +65,7 @@ def handle(name, cfg, _cloud, log, _args): (idevs, idevs_empty)) log.debug("Setting grub debconf-set-selections with '%s','%s'" % - (idevs, idevs_empty)) + (idevs, idevs_empty)) try: util.subp(['debconf-set-selections'], dconf_sel) |