From 8a676fab2386045951488682d8462bac68dc53f6 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 31 Jul 2014 10:37:18 +0100
Subject: [PATCH] Import patches-unapplied version 2.233 to
 ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 82eb59481a00162dda3996611b39053230ed14b9

New changelog entries:
  [ Colin Watson ]
  * live-build/auto/config: Add configuration for new kubuntu-plasma5
    flavour.
  [ James Hunt ]
  * ubuntu-core: Run setup hooks as done for ubuntu-touch.
---
 debian/changelog                                 | 11 +++++++++++
 live-build/auto/config                           | 16 ++++++++++++++--
 .../ubuntu-core/hooks/01-setup_user.chroot       | 12 ++++++++++++
 .../hooks/02-add_user_to_groups.chroot           |  8 ++++++++
 .../hooks/99-remove-documentation.chroot         | 11 +++++++++++
 5 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100755 live-build/ubuntu-core/hooks/01-setup_user.chroot
 create mode 100755 live-build/ubuntu-core/hooks/02-add_user_to_groups.chroot
 create mode 100755 live-build/ubuntu-core/hooks/99-remove-documentation.chroot

diff --git a/debian/changelog b/debian/changelog
index b4daa2e6..4d353443 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+livecd-rootfs (2.233) utopic; urgency=medium
+
+  [ Colin Watson ]
+  * live-build/auto/config: Add configuration for new kubuntu-plasma5
+    flavour.
+
+  [ James Hunt ]
+  * ubuntu-core: Run setup hooks as done for ubuntu-touch.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 31 Jul 2014 10:37:18 +0100
+
 livecd-rootfs (2.232) utopic; urgency=medium
 
   [ James Hunt ]
diff --git a/live-build/auto/config b/live-build/auto/config
index 9d49de44..743ec985 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -233,6 +233,18 @@ case $PROJECT in
 		add_chroot_hook remove-gnome-icon-cache
 		;;
 
+	kubuntu-plasma5)
+		add_task install minimal standard
+		add_package install kubuntu-plasma5-desktop
+		# Technically cheating, but PPAs don't have tasks and the
+		# live seed doesn't have a corresponding metapackage.  We'll
+		# get away with this as long as kubuntu-desktop and
+		# kubuntu-plasma5-desktop don't grow too far apart.
+		LIVE_TASK='kubuntu-live'
+		COMPONENTS='main restricted universe'
+		add_chroot_hook remove-gnome-icon-cache
+		;;
+
 	edubuntu|edubuntu-dvd)
 		add_task install minimal standard ubuntu-desktop edubuntu-desktop-gnome
 		LIVE_TASK='edubuntu-live'
@@ -549,8 +561,8 @@ EOF
 		fi
 		;;
 
-	ubuntu-touch)
-		cp -af /usr/share/livecd-rootfs/live-build/ubuntu-touch/* \
+	ubuntu-touch|ubuntu-core)
+		cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
 			config/
 		;;
 esac
diff --git a/live-build/ubuntu-core/hooks/01-setup_user.chroot b/live-build/ubuntu-core/hooks/01-setup_user.chroot
new file mode 100755
index 00000000..a8689e3b
--- /dev/null
+++ b/live-build/ubuntu-core/hooks/01-setup_user.chroot
@@ -0,0 +1,12 @@
+#!/bin/sh -x
+
+USER=ubuntu
+UGID=1000
+
+echo "I: creating default user $USER"
+adduser --gecos $USER --disabled-login $USER --uid $UGID
+
+echo "I: set user $USER password to $USER"
+echo "$USER:$USER" | chpasswd
+
+chown -R $UGID:$UGID /home/$USER
diff --git a/live-build/ubuntu-core/hooks/02-add_user_to_groups.chroot b/live-build/ubuntu-core/hooks/02-add_user_to_groups.chroot
new file mode 100755
index 00000000..2e48e233
--- /dev/null
+++ b/live-build/ubuntu-core/hooks/02-add_user_to_groups.chroot
@@ -0,0 +1,8 @@
+#!/bin/sh -x
+
+USER=ubuntu
+
+DEFGROUPS="sudo"
+
+echo "I: add $USER to ($DEFGROUPS) group(s)"
+usermod -a -G ${DEFGROUPS} ${USER}
diff --git a/live-build/ubuntu-core/hooks/99-remove-documentation.chroot b/live-build/ubuntu-core/hooks/99-remove-documentation.chroot
new file mode 100755
index 00000000..593d8a87
--- /dev/null
+++ b/live-build/ubuntu-core/hooks/99-remove-documentation.chroot
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# remove-documentation: Remove unnecessary documentation to reduce disk usage
+#
+# Author: Alex Chiang <achiang@canonical.com>
+# Date  : November 9, 2010
+
+echo "Removing documentation..."
+find /usr/share/doc -depth -type f ! -name copyright|xargs rm || true
+find /usr/share/doc -empty|xargs rmdir || true
+rm -rf /usr/share/man /usr/share/groff /usr/share/info /usr/share/lintian /usr/share/linda /var/cache/man