merge with trunk

1 files changed, 15 insertions, 11 deletions

diff --git a/cloudinit/config/cc_grub_dpkg.py b/cloudinit/config/cc_grub_dpkg.py
index e3219e81..3c2d9985 100644
--- a/cloudinit/config/cc_grub_dpkg.py
+++ b/cloudinit/config/cc_grub_dpkg.py
@@ -25,19 +25,23 @@ from cloudinit import util
 distros = ['ubuntu', 'debian']
 
 
-def handle(_name, cfg, _cloud, log, _args):
-    idevs = None
-    idevs_empty = None
+def handle(name, cfg, _cloud, log, _args):
 
-    if "grub-dpkg" in cfg:
-        idevs = util.get_cfg_option_str(cfg["grub-dpkg"],
-            "grub-pc/install_devices", None)
-        idevs_empty = util.get_cfg_option_str(cfg["grub-dpkg"],
-            "grub-pc/install_devices_empty", None)
+    mycfg = cfg.get("grub_dpkg", cfg.get("grub-dpkg", {}))
+    if not mycfg:
+        mycfg = {}
+
+    enabled = mycfg.get('enabled', True)
+    if util.is_false(enabled):
+        log.debug("%s disabled by config grub_dpkg/enabled=%s", name, enabled)
+        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)
 
     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:
@@ -61,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)