Merge lp:~xnox/livecd-rootfs/force-resolved-stub-resolver into lp:livecd-rootfs

[Dimitri John Ledkov]

  Fix images built with empty resolv.conf. LP: #1712283
  After removing resolvconf from important, images started to build with
  /etc/resolv.conf that is a regular empty file. However, it should
  instead point at systemd-resolved stub-resolv.conf file. Thus force
  various build hooks/scripts/functions to make it so.

[Dimitri John Ledkov (xnox)]

Wrong path

[Dimitri John Ledkov (xnox)]

Actually no, systemd postinst should handle this similar to how resolv.conf does it.

Specifically, move /etc/resolv.conf out of the way to /run, and replace it with the actually desired symlink.

[Steve Langasek (vorlon)]

Most of the resolv.conf handling in livecd-rootfs doesn't require any knowledge of the policy of where /etc/resolv.conf should point. We should not change this. The target of /etc/resolv.conf should be set up by the systemd maintainer scripts, and livecd-rootfs should only need to manage the target on a temporary basis so that there's working dns resolution within the chroot as part of the build.

So most of these references should not be changed. And live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot probably needs to be dropped completely - it should be superfluous under both resolvconf and systemd.

review: Needs Fixing

[Steve Langasek (vorlon)]

(And if it's *not* superfluous, we should fix *that* instead of having a hard-coded hack in livecd-rootfs.)

[lp:~xnox/livecd-rootfs/force-resolved-stub-resolver]

1496. By Dimitri John Ledkov on 2017-08-22

Update resolv.conf symlink target in include.chroot and server fixup
hook. LP: #1712283

[Steve Langasek (vorlon)]

These bits should be dropped rather than the target changed.

review: Needs Fixing

Unmerged revisions

1496. By Dimitri John Ledkov on 2017-08-22

Update resolv.conf symlink target in include.chroot and server fixup
hook. LP: #1712283

=== modified file 'debian/changelog'
--- debian/changelog	2017-08-18 08:12:22 +0000
+++ debian/changelog	2017-08-22 16:54:57 +0000
@@ -3,6 +3,10 @@
   [ Steve Langasek ]
   * Set a default locale of C.UTF-8 in the cloud images.
 
+  [ Dimitri John Ledkov ]
+  * Update resolv.conf symlink target in include.chroot and server fixup
+    hook. LP: #1712283
+
  -- Dimitri John Ledkov <[e-mail]>  Fri, 18 Aug 2017 09:11:42 +0100
 
 livecd-rootfs (2.449) artful; urgency=medium

=== modified symlink 'live-build/ubuntu-core/includes.chroot/etc/resolv.conf'
=== target changed u'../run/resolvconf/resolv.conf' => u'../run/systemd/resolve/stub-resolv.conf'
=== modified symlink 'live-build/ubuntu-desktop-next/includes.chroot/etc/resolv.conf'
=== target changed u'../run/resolvconf/resolv.conf' => u'../run/systemd/resolve/stub-resolv.conf'
=== modified file 'live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot'
--- live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot	2017-03-21 00:57:45 +0000
+++ live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot	2017-08-22 16:54:57 +0000
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-ln -snf ../run/resolvconf/resolv.conf /etc/resolv.conf
+ln -snf ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf