Import patches-unapplied version 2.348 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 0682fffca187ed3d1686d3802e50785b54eee3fc

New changelog entries:
  * limit grub-install diversion on snappy images to x86 architectures
  * divert grub-install on snappy images during rootfs build

debian/changelog

@@ -1,3 +1,15 @@
+livecd-rootfs (2.348) wily; urgency=medium
+
+  * limit grub-install diversion on snappy images to x86 architectures
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 09 Oct 2015 12:52:57 +0200
+
+livecd-rootfs (2.347) wily; urgency=medium
+
+  * divert grub-install on snappy images during rootfs build
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 09 Oct 2015 12:44:04 +0200
+
 livecd-rootfs (2.346) wily; urgency=medium
 
   * merge lp:~sil2100/livecd-rootfs/remove_apt_lists to drop cruft from

live-build/ubuntu-core/hooks/01-divert-grub-install.chroot_early

@@ -0,0 +1,19 @@
+#!/bin/sh -ex
+
+ARCH=$(dpkg --print-architecture)
+
+case $ARCH in
+    i386|amd64)
+        dpkg-divert --quiet --add \
+                --divert /usr/sbin/grub-install.REAL --rename \
+                /usr/sbin/grub-install
+
+        cat > /usr/sbin/grub-install <<'EOF'
+#! /bin/sh
+echo "grub-install: diverted by livecd-rootfs (will be called later)" >&2
+exit 0
+EOF
+
+        chmod +x /usr/sbin/grub-install
+    ;;
+esac

live-build/ubuntu-core/hooks/99-undivert-grub-install.chroot

@@ -0,0 +1,10 @@
+#! /bin/sh -ex
+
+ARCH=$(dpkg --print-architecture)
+
+case $ARCH in
+    i386|amd64)
+        rm -f /usr/sbin/grub-install
+        dpkg-divert --quiet --remove --rename /usr/sbin/grub-install
+    ;;
+esac