livecd-rootfs

Merge lp:~jamesodhunt/livecd-rootfs/configure-resolvconf-for-ubuntu-core into lp:livecd-rootfs

  1. configure-resolvconf-for-ubuntu-core
  2. Merge into trunk
Proposed by James Hunt
Status: Merged
Merged at revision: 967
Proposed branch: lp:~jamesodhunt/livecd-rootfs/configure-resolvconf-for-ubuntu-core
Merge into: lp:livecd-rootfs
Diff against target: 22 lines (+10/-0)
2 files modified
debian/changelog (+7/-0)
live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot (+3/-0)
To merge this branch: bzr merge lp:~jamesodhunt/livecd-rootfs/configure-resolvconf-for-ubuntu-core
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+236134@code.launchpad.net

Description of the change

Create /etc/resolv.conf as a sym link for Ubuntu Core. This has to happen here since /etc will be read-only, which stops resolvconf manipulating the file.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-09-24 10:00:39 +0000
3+++ debian/changelog 2014-09-26 14:37:05 +0000
4@@ -1,3 +1,10 @@
5+livecd-rootfs (2.247) UNRELEASED; urgency=medium
6+
7+ * live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot: Configure
8+ resolv.donf for Ubuntu Core.
9+
10+ -- James Hunt <james.hunt@ubuntu.com> Fri, 26 Sep 2014 15:33:45 +0100
11+
12 livecd-rootfs (2.246) utopic; urgency=medium
13
14 * live-build/auto/config: Use ubuntukylin-live task for ubuntukylin, not
15
16=== added file 'live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot'
17--- live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot 1970-01-01 00:00:00 +0000
18+++ live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot 2014-09-26 14:37:05 +0000
19@@ -0,0 +1,3 @@
20+#!/bin/sh -x
21+
22+ln -s /run/resolvconf/resolv.conf /etc/resolv.conf

Subscribers

People subscribed via source and target branches