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

Imported using git-ubuntu import.

Changelog parent: 8c606962fa

New changelog entries:
  * do not hardcode installation of grub-pc for amd64 in snappy images,
    instead install the right grub set for secureboot there

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.349) wily; urgency=medium
+
+  * do not hardcode installation of grub-pc for amd64 in snappy images,
+    instead install the right grub set for secureboot there
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 09 Oct 2015 17:47:03 +0200
+
 livecd-rootfs (2.348) wily; urgency=medium
 
   * limit grub-install diversion on snappy images to x86 architectures

live-build/auto/config

@@ -402,9 +402,14 @@ case $PROJECT in
 			# generic kernel etc
 			KERNEL_FLAVOURS=generic
 			case $ARCH in
-				i386|amd64)
+				i386)
 					add_package install grub-pc
 					;;
+				amd64)
+					add_package install grub-pc-bin
+					add_package install grub-efi-amd64-signed
+					add_package install shim-signed
+					;;
 				armhf)
 					add_package install flash-kernel u-boot-tools
 					;;