Merge lp:~darkmuggle-deactivatedaccount/ubuntu/precise/cloud-init/lp1336855 into lp:ubuntu/precise-proposed/cloud-init

[Ben Howard]

[lp:~darkmuggle-deactivatedaccount/ubuntu/precise/cloud-init/lp1336855]

209. By Ben Howard on 2014-07-03

* fixed issues where grub-pc does not consider xvda (LP: 1336855).
  - debian/patches/lp-1336855-grub_xvda.patch: added xvda as a
    considered device
  - debian/cloud-init.postinst: check to see if grub-pc is configured
    for the right device.

[Robert C Jennings (rcj)]

Comments below

[lp:~darkmuggle-deactivatedaccount/ubuntu/precise/cloud-init/lp1336855]

210. By Ben Howard on 2014-07-03

Remove mtab reading and replace with chroot check

211. By Ben Howard on 2014-07-03

Fixed minor typo

[Iain Lane (laney)]

hi smoser, care to review?

thanks!

[Scott Moser (smoser)]

One comment in line (wrt chroot).
Also, would it make sense to just run:
  cloud-init --frequency=always --name=grub-dpkg
that might stop us from re-implementing logic already present in cloud-init in its postinst.

You'd ideally only do that (or all of this) in a case where the version that we're upgrading from is known-broken.

[Sebastien Bacher (seb128)]

what's the status of that, was the previous comment a blocker/something that needs to be addressed before upload?

[Sebastien Bacher (seb128)]

no reply, setting to "work in progress" to get out of the sponsoring queue until the issue is addressed, change back to "needs review" when that is done

Unmerged revisions

211. By Ben Howard on 2014-07-03

Fixed minor typo

210. By Ben Howard on 2014-07-03

Remove mtab reading and replace with chroot check

209. By Ben Howard on 2014-07-03

* fixed issues where grub-pc does not consider xvda (LP: 1336855).
  - debian/patches/lp-1336855-grub_xvda.patch: added xvda as a
    considered device
  - debian/cloud-init.postinst: check to see if grub-pc is configured
    for the right device.

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2014-04-07 14:59:56 +0000
+++ .pc/applied-patches	2014-07-03 20:47:31 +0000
@@ -22,3 +22,4 @@
 lp-1269626-azure_new_instance.patch
 lp-1292648-azure-format-ephemeral-new.patch
 lp-1302229-fix_futils_azure.patch
+lp-1336855-grub_xvda.patch

=== added directory '.pc/lp-1336855-grub_xvda.patch'
=== added directory '.pc/lp-1336855-grub_xvda.patch/cloudinit'
=== added directory '.pc/lp-1336855-grub_xvda.patch/cloudinit/CloudConfig'
=== added file '.pc/lp-1336855-grub_xvda.patch/cloudinit/CloudConfig/cc_grub_dpkg.py'
--- .pc/lp-1336855-grub_xvda.patch/cloudinit/CloudConfig/cc_grub_dpkg.py	1970-01-01 00:00:00 +0000
+++ .pc/lp-1336855-grub_xvda.patch/cloudinit/CloudConfig/cc_grub_dpkg.py	2014-07-03 20:47:31 +0000
@@ -0,0 +1,64 @@
+# vi: ts=4 expandtab
+#
+#    Copyright (C) 2009-2010 Canonical Ltd.
+#    Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
+#
+#    Author: Scott Moser <[e-mail]>
+#    Author: Juerg Haefliger <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import cloudinit.util as util
+import traceback
+import os
+
+
+def handle(_name, cfg, _cloud, log, _args):
+    idevs = None
+    idevs_empty = None
+
+    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)
+
+    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"))):
+        if idevs == None:
+            idevs = ""
+        if idevs_empty == None:
+            idevs_empty = "true"
+    else:
+        if idevs_empty == None:
+            idevs_empty = "false"
+        if idevs == None:
+            idevs = "/dev/sda"
+            for dev in ("/dev/sda", "/dev/vda", "/dev/sda1", "/dev/vda1"):
+                if os.path.exists(dev):
+                    idevs = dev
+                    break
+
+    # now idevs and idevs_empty are set to determined values
+    # or, those set by user
+
+    dconf_sel = "grub-pc grub-pc/install_devices string %s\n" % idevs + \
+        "grub-pc grub-pc/install_devices_empty boolean %s\n" % idevs_empty
+    log.debug("setting grub debconf-set-selections with '%s','%s'" %
+        (idevs, idevs_empty))
+
+    try:
+        util.subp(('debconf-set-selections'), dconf_sel)
+    except:
+        log.error("Failed to run debconf-set-selections for grub-dpkg")
+        log.debug(traceback.format_exc())

=== modified file 'cloudinit/CloudConfig/cc_grub_dpkg.py'
--- cloudinit/CloudConfig/cc_grub_dpkg.py	2012-02-16 17:27:05 +0000
+++ cloudinit/CloudConfig/cc_grub_dpkg.py	2014-07-03 20:47:31 +0000
@@ -44,7 +44,8 @@
             idevs_empty = "false"
         if idevs == None:
             idevs = "/dev/sda"
-            for dev in ("/dev/sda", "/dev/vda", "/dev/sda1", "/dev/vda1"):
+            for dev in ("/dev/sda", "/dev/vda", "/dev/xvda",
+                        "/dev/xvda1", "/dev/sda1", "/dev/vda1"):
                 if os.path.exists(dev):
                     idevs = dev
                     break

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-07 15:18:55 +0000
+++ debian/changelog	2014-07-03 20:47:31 +0000
@@ -1,3 +1,13 @@
+cloud-init (0.6.3-0ubuntu1.14) precise; urgency=medium
+
+  * fixed issues where grub-pc does not consider xvda (LP: 1336855).
+    - debian/patches/lp-1336855-grub_xvda.patch: added xvda as a
+      considered device
+    - debian/cloud-init.postinst: check to see if grub-pc is configured
+      for the right device.
+
+ -- Ben Howard <[e-mail]>  Wed, 02 Jul 2014 13:42:12 -0600
+
 cloud-init (0.6.3-0ubuntu1.13) precise-proposed; urgency=medium
 
   * debian/patches/lp-1302229-fix_futils_azure.patch: fixed imports and

=== modified file 'debian/cloud-init.postinst'
--- debian/cloud-init.postinst	2013-10-16 13:17:35 +0000
+++ debian/cloud-init.postinst	2014-07-03 20:47:31 +0000
@@ -157,6 +157,57 @@
 
    # if there is generic cloud-config preseed, apply them
    handle_preseed_local_cloud_config
+
+   ### Begin fix for LP: 1336855
+   # fix issue where cloud-init misidentifies the location of grub
+   if [ -x /usr/sbin/grub-install ]; then
+
+      # First, identify the root device for the parent.
+      for parm in $(cat /proc/cmdline); do
+           dev=$(echo $parm | awk -F\= '{print$NF}')
+           case $parm in
+               root=UUID*)  [ -d /dev/disk/by-uuid ] &&
+                                root_dev=$(readlink -f /dev/disk/by-uuid/$dev);;
+               root=LABEL*) [ -d /dev/disk/by-label ] &&
+                                root_dev=$(readlink -f /dev/disk/by-label/$dev);;
+               root=/dev*)  [ -d /dev ] &&
+                                root_dev=$(readlink -f $dev);;
+           esac
+           [ -n "$root_dev" ] && break
+      done
+
+      # Only deal with simple, cloud-based devices
+      case $root_dev in
+           /dev/vda*|/dev/xvda*|/dev/sda*) install_grub_safe=1;;
+           *) install_grub_safe=0;;
+      esac
+
+      # Make sure that we are not chrooted. We want to be safe.
+      [ "$(stat -c %d:%i /)" != "$(stat -c %d:%i /proc/1/root/.)" ] &&
+            install_grub_safe=0;
+
+      if [ "$install_grub_safe" -eq 1 ]; then
+         # Find out where grub thinks the root device is
+         db_get grub-pc/install_devices && grub_cfg_dev=${RET} || :
+         db_get grub-pc/install_devices_empty && grub_dev_empty=${RET} || :
+
+         # Find out the parent device for the root device
+         block_path=$(udevadm info -q path -n $root_dev | awk '-Fblock/' '{print$NF}')
+         pdev=$(echo $block_path | awk '-F/' '{print$1}')
+         [ -n "$pdev" ] && parent_dev="/dev/$pdev"
+
+         # If everything checks out, set grub-pc/install_devices and re-install
+         # grub.
+         if [ "$grub_dev_empty" = "false" -a -n "$parent_dev" -a "$parent_dev" != "$grub_cfg_dev" ]; then
+           echo "Reconfiguring grub install device due to mismatch"
+           db_set grub-pc/install_devices "$parent_dev"
+           grub-install $parent_dev ||
+              echo "WARNING! Unable to fix grub device mismatch. You may be broken."
+         fi
+      fi
+   fi
+   ### END fix for LP: 1336855
+
 fi
 
 #DEBHELPER#

=== added file 'debian/patches/lp-1336855-grub_xvda.patch'
--- debian/patches/lp-1336855-grub_xvda.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/lp-1336855-grub_xvda.patch	2014-07-03 20:47:31 +0000
@@ -0,0 +1,19 @@
+Description: consider xvda devices for grub-pc configuration
+ Cloud-init previously did not consider /dev/xvda and /dev/xvda1 for
+ setting as the grub device. Subsequently, unattended updates with
+ grub may cause the instance to be unusable.
+Author: Ben Howard <[e-mail]>
+Bug: https://bugs.launchpad.net/bugs/1336855
+Forwarded: yes
+--- a/cloudinit/CloudConfig/cc_grub_dpkg.py
++++ b/cloudinit/CloudConfig/cc_grub_dpkg.py
+@@ -44,7 +44,8 @@
+             idevs_empty = "false"
+         if idevs == None:
+             idevs = "/dev/sda"
+-            for dev in ("/dev/sda", "/dev/vda", "/dev/sda1", "/dev/vda1"):
++            for dev in ("/dev/sda", "/dev/vda", "/dev/xvda",
++                        "/dev/xvda1", "/dev/sda1", "/dev/vda1"):
+                 if os.path.exists(dev):
+                     idevs = dev
+                     break

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-04-07 14:59:56 +0000
+++ debian/patches/series	2014-07-03 20:47:31 +0000
@@ -22,3 +22,4 @@
 lp-1269626-azure_new_instance.patch
 lp-1292648-azure-format-ephemeral-new.patch
 lp-1302229-fix_futils_azure.patch
+lp-1336855-grub_xvda.patch