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

Proposed by James Hunt
Status: Rejected
Rejected by: Oliver Grawert
Proposed branch: lp:~jamesodhunt/livecd-rootfs/system-image-make-etc-hostname-writable
Merge into: lp:livecd-rootfs
Diff against target: 36 lines (+24/-0)
2 files modified
debian/changelog (+8/-0)
live-build/ubuntu-core/hooks/08-etc-writable.chroot (+16/-0)
To merge this branch: bzr merge lp:~jamesodhunt/livecd-rootfs/system-image-make-etc-hostname-writable
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+239310@code.launchpad.net

Description of the change

* 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.

To post a comment you must log in.
988. By James Hunt

* Remove /etc/machine-info logic.

Revision history for this message
Oliver Grawert (ogra) wrote :

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

* Remove /etc/machine-info logic.

987. By 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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1livecd-rootfs (2.258) UNRELEASED; urgency=medium
2
3 * live-build/ubuntu-core/hooks/08-etc-writable.chroot: Allow
4 /etc/hostname to be writable since cloud-init needs the ability to set
5 the hostname.
6
7 -- James Hunt <james.hunt@ubuntu.com> Wed, 22 Oct 2014 17:03:37 -0400
8
1livecd-rootfs (2.257) utopic; urgency=medium9livecd-rootfs (2.257) utopic; urgency=medium
210
3 * Drop the click packages moved in 2.255 from the rootfs, leaving them11 * Drop the click packages moved in 2.255 from the rootfs, leaving them
412
=== 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 @@
1#!/bin/sh
2set -e
3set -x
4
5mkdir -p /etc/writable
6
7# cloud-init needs to be able to modify hostname and has the ability to
8# set the other two.
9for f in timezone localtime hostname; do
10 if [ -e /etc/$f ]; then
11 echo "I: Moving /etc/$f to /etc/writable/"
12 mv /etc/$f /etc/writable/$f
13 fi
14 echo "I: Linking /etc/$f to /etc/writable/"
15 ln -s writable/$f /etc/$f
16done

Subscribers

People subscribed via source and target branches