From 2a16157ad888516e2e212fd1945fd7804fefcaa2 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Thu, 2 Jul 2015 15:53:43 +0200
Subject: [PATCH] Import patches-unapplied version 2.323 to
ubuntu/wily-proposed
Imported using git-ubuntu import.
Changelog parent: 99a5bff9d95cb53fb5b84ddb4c3ca001e3f2ac2b
New changelog entries:
* live-build/ubuntu-desktop-next/hooks/11-remove-extra-packages.chroot:
- remove click from desktop-next
---
debian/changelog | 7 +++++++
.../ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early | 1 +
.../hooks/11-remove-extra-packages.chroot | 6 ++++++
3 files changed, 14 insertions(+)
create mode 100644 live-build/ubuntu-desktop-next/hooks/11-remove-extra-packages.chroot
diff --git a/debian/changelog b/debian/changelog
index 70ac73de..ffa7593e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.323) wily; urgency=medium
+
+ * live-build/ubuntu-desktop-next/hooks/11-remove-extra-packages.chroot:
+ - remove click from desktop-next
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 02 Jul 2015 15:53:43 +0200
+
livecd-rootfs (2.322) wily; urgency=medium
* live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early:
diff --git a/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early
index c3f901d1..1c47482a 100755
--- a/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early
+++ b/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early
@@ -53,6 +53,7 @@ rtkit:x:114:123:RealtimeKit,,,:/proc:/bin/false
usbmux:x:115:46:usbmux daemon,,,:/var/lib/usbmux:/bin/false
colord:x:116:124:colord colour management daemon,,,:/var/lib/colord:/bin/false
lightdm:x:117:126:Light Display Manager:/var/lib/lightdm:/bin/false
+clickpkg:x:118:128::/nonexistent:/bin/false
EOF
else
echo "/etc/passwd post-debootstrap hash doesn't match record" >&2
diff --git a/live-build/ubuntu-desktop-next/hooks/11-remove-extra-packages.chroot b/live-build/ubuntu-desktop-next/hooks/11-remove-extra-packages.chroot
new file mode 100644
index 00000000..51d8e5bd
--- /dev/null
+++ b/live-build/ubuntu-desktop-next/hooks/11-remove-extra-packages.chroot
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+# we don't want click on snappy image
+apt-get purge -y click