Merge lp:~jamesodhunt/livecd-rootfs/system-image-network+systemd-setup into lp:livecd-rootfs

[James Hunt]

[lp:~jamesodhunt/livecd-rootfs/system-image-network+systemd-setup]

941. By James Hunt on 2014-08-04

* Use /etc/network/interfaces.d/ rather than /etc/network/interfaces.

[Colin Watson (cjwatson)]

review: Approve

=== added file 'live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot'
--- live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot	1970-01-01 00:00:00 +0000
+++ live-build/ubuntu-core/hooks/03-boot_with_systemd.chroot	2014-08-04 13:33:27 +0000
@@ -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

=== added file 'live-build/ubuntu-core/hooks/04-configure_network.chroot'
--- live-build/ubuntu-core/hooks/04-configure_network.chroot	1970-01-01 00:00:00 +0000
+++ live-build/ubuntu-core/hooks/04-configure_network.chroot	2014-08-04 13:33:27 +0000
@@ -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

=== removed file 'live-build/ubuntu-core/hooks/99-remove-documentation.chroot'
--- live-build/ubuntu-core/hooks/99-remove-documentation.chroot	2014-07-29 20:21:41 +0000
+++ live-build/ubuntu-core/hooks/99-remove-documentation.chroot	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# remove-documentation: Remove unnecessary documentation to reduce disk usage
-#
-# Author: Alex Chiang <[e-mail]>
-# 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