Import patches-unapplied version 2.298 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 8657aaf80ba297aa634eb75972d8eb45358092ad

New changelog entries:
  * live-build/auto/config:
    - remove resolvconf, click-apparmor, dosfstools
    - shuffle install order around
  * snappy:
    + remove click-hook-framework
    + remove /etc/init.d/grub-common

debian/changelog

@@ -1,3 +1,14 @@
+livecd-rootfs (2.298) vivid; urgency=low
+
+  * live-build/auto/config:
+    - remove resolvconf, click-apparmor, dosfstools
+    - shuffle install order around
+  * snappy:
+    + remove click-hook-framework
+    + remove /etc/init.d/grub-common 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 16 Apr 2015 09:37:34 -0500
+
 livecd-rootfs (2.297) vivid; urgency=low
 
   * fix device.tar.gz generation for snappy

live-build/auto/config

@@ -364,26 +364,17 @@ case $PROJECT in
 		if [ "$SUBPROJECT" = "system-image" ]; then
 		        OPTS="${OPTS:+$OPTS }--apt-recommends false"
 
-                        # no minimal as we want to be really minimal
-		        #add_task install minimal
-			add_task install ubuntu-core
-
-                        # only available in the PPA right now
-                        add_package install click-hook-framework
-
                         # some workarounds because the seeds are not quite
                         # corrent at the moment
 		        add_package install dbus
-		        add_package install libpam-systemd
                         add_package install isc-dhcp-client
-                        add_package install resolvconf
+		        add_package install libpam-systemd
-                        add_package install click-apparmor
                         # no Task: header yet
                         add_package install ubuntu-snappy
  
-                        # this is required for systemd to fsck the /boot
+                        # no minimal as we want to be really minimal
-                        # partition
+		        #add_task install minimal
-                        add_package install dosfstools
+			add_task install ubuntu-core
 
                         # add special azure package
                         case $ARCH in

live-build/ubuntu-core/hooks/15-remove-grub-common.chroot

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# see bug https://bugs.launchpad.net/snappy-ubuntu/+bug/1442231
+rm -f /etc/init.d/grub-common