From 5264712d26587dde7e8591dec2370d4a26bd2b74 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 4 Aug 2014 16:12:43 +0200
Subject: [PATCH] Import patches-unapplied version 2.234 to
 ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 8a676fab2386045951488682d8462bac68dc53f6

New changelog entries:
  [ James Hunt ]
  * ubuntu-core:
    - Don't remove doc to be kind to devs.
    - Boot with systemd (temporary method until we have systemd-sysv).
    - Configure first network interface.
---
 debian/changelog                                      | 10 ++++++++++
 .../ubuntu-core/hooks/03-boot_with_systemd.chroot     |  9 +++++++++
 .../ubuntu-core/hooks/04-configure_network.chroot     |  9 +++++++++
 .../ubuntu-core/hooks/99-remove-documentation.chroot  | 11 -----------
 4 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100755 live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot
 create mode 100755 live-build/ubuntu-core/hooks/04-configure_network.chroot
 delete mode 100755 live-build/ubuntu-core/hooks/99-remove-documentation.chroot

diff --git a/debian/changelog b/debian/changelog
index 4d353443..1671a8be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+livecd-rootfs (2.234) utopic; urgency=medium
+
+  [ James Hunt ]
+  * ubuntu-core:
+    - Don't remove doc to be kind to devs.
+    - Boot with systemd (temporary method until we have systemd-sysv).
+    - Configure first network interface.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 04 Aug 2014 16:12:43 +0200
+
 livecd-rootfs (2.233) utopic; urgency=medium
 
   [ Colin Watson ]
diff --git a/live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot b/live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot
new file mode 100755
index 00000000..d8f4c7db
--- /dev/null
+++ b/live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot
@@ -0,0 +1,9 @@
+#!/bin/sh -x
+
+# Boot using systemd and disable quiet boot
+# to see what is happening.
+systemd=/lib/systemd/systemd
+sed \
+    -e 's,^\([ 	]*GRUB_CMDLINE_LINUX\)=""$,\1="init=$systemd",g' \
+    -e 's,^\([ 	]*GRUB_CMDLINE_LINUX_DEFAULT\)="quiet splash",\1="",g' \
+    /etc/default/grub
diff --git a/live-build/ubuntu-core/hooks/04-configure_network.chroot b/live-build/ubuntu-core/hooks/04-configure_network.chroot
new file mode 100755
index 00000000..745372ad
--- /dev/null
+++ b/live-build/ubuntu-core/hooks/04-configure_network.chroot
@@ -0,0 +1,9 @@
+#!/bin/sh -x
+
+if=eth0
+
+# Manually configure the first ethernet device
+cat >/etc/network/interfaces.d/"$if"<<EOT
+auto $if
+iface $if inet dhcp
+EOT
diff --git a/live-build/ubuntu-core/hooks/99-remove-documentation.chroot b/live-build/ubuntu-core/hooks/99-remove-documentation.chroot
deleted file mode 100755
index 593d8a87..00000000
--- a/live-build/ubuntu-core/hooks/99-remove-documentation.chroot
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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