Merge lp:~jamesodhunt/livecd-rootfs/system-image-make-etc-hostname-writable into lp:livecd-rootfs

[James Hunt]

* live-build/ubuntu-core/hooks/08-etc-writable.chroot: Allow
  /etc/hostname to be writable since cloud-init needs the ability to set
  the hostname.

[lp:~jamesodhunt/livecd-rootfs/system-image-make-etc-hostname-writable]

988. By James Hunt on 2014-10-22

* Remove /etc/machine-info logic.

[Oliver Grawert (ogra)]

this seemds to have been merged already, setting to rejected (so it does not show on the "to merge" list anymore). please turn it back if that is wrong.

Unmerged revisions

988. By James Hunt on 2014-10-22

* Remove /etc/machine-info logic.

987. By James Hunt on 2014-10-22

live-build/ubuntu-core/hooks/08-etc-writable.chroot: Allow
/etc/hostname to be writable since cloud-init needs the ability to set
the hostname.

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-15 20:12:57 +0000
+++ debian/changelog	2014-10-22 21:09:53 +0000
@@ -1,3 +1,11 @@
+livecd-rootfs (2.258) UNRELEASED; urgency=medium
+
+  * live-build/ubuntu-core/hooks/08-etc-writable.chroot: Allow
+    /etc/hostname to be writable since cloud-init needs the ability to set
+    the hostname.
+
+ -- James Hunt <[e-mail]>  Wed, 22 Oct 2014 17:03:37 -0400
+
 livecd-rootfs (2.257) utopic; urgency=medium
 
   * Drop the click packages moved in 2.255 from the rootfs, leaving them

=== added file 'live-build/ubuntu-core/hooks/08-etc-writable.chroot'
--- live-build/ubuntu-core/hooks/08-etc-writable.chroot	1970-01-01 00:00:00 +0000
+++ live-build/ubuntu-core/hooks/08-etc-writable.chroot	2014-10-22 21:09:53 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+set -x
+
+mkdir -p /etc/writable
+
+# cloud-init needs to be able to modify hostname and has the ability to
+# set the other two.
+for f in timezone localtime hostname; do
+    if [ -e /etc/$f ]; then
+        echo "I: Moving /etc/$f to /etc/writable/"
+        mv /etc/$f /etc/writable/$f
+    fi
+    echo "I: Linking /etc/$f to /etc/writable/"
+    ln -s writable/$f /etc/$f
+done