From da9dd163bad89ade1243926c6abcc146cb6188f3 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 16 Apr 2015 09:37:34 -0500
Subject: [PATCH] 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                              | 11 +++++++++++
 live-build/auto/config                        | 19 +++++--------------
 .../hooks/15-remove-grub-common.chroot        |  4 ++++
 3 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100644 live-build/ubuntu-core/hooks/15-remove-grub-common.chroot

diff --git a/debian/changelog b/debian/changelog
index e9c37427..163d9890 100644
--- a/debian/changelog
+++ b/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
diff --git a/live-build/auto/config b/live-build/auto/config
index 2d331b2c..c11ea361 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -364,27 +364,18 @@ 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 click-apparmor
+		        add_package install libpam-systemd
                         # no Task: header yet
                         add_package install ubuntu-snappy
+ 
+                        # no minimal as we want to be really minimal
+		        #add_task install minimal
+			add_task install ubuntu-core
 
-                        # this is required for systemd to fsck the /boot
-                        # partition
-                        add_package install dosfstools
-                        
                         # add special azure package
                         case $ARCH in
                             amd64)
diff --git a/live-build/ubuntu-core/hooks/15-remove-grub-common.chroot b/live-build/ubuntu-core/hooks/15-remove-grub-common.chroot
new file mode 100644
index 00000000..cd300d4b
--- /dev/null
+++ b/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
\ No newline at end of file