livecd-rootfs

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

force-resolved-stub-resolver
Merge into trunk

Proposed by Dimitri John Ledkov on 2017-08-22

Status:

Rejected

Rejected by:

Dimitri John Ledkov on 2017-10-11

Proposed branch:

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

Merge into:

lp://staging/livecd-rootfs

Diff against target:

27 lines (+5/-1)

2 files modified

debian/changelog (+4/-0)
live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot (+1/-1)

To merge this branch:

bzr merge lp://staging/~xnox/livecd-rootfs/force-resolved-stub-resolver

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Steve Langasek		2017-08-22	Needs Fixing on 2017-08-22
Review via email: mp+329358@code.staging.launchpad.net

Description of the change

  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.

Revision history for this message

Dimitri John Ledkov (xnox) wrote on 2017-08-22:

Wrong path

Revision history for this message

Dimitri John Ledkov (xnox) wrote on 2017-08-22:

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.

Revision history for this message

Steve Langasek (vorlon) wrote on 2017-08-22:

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

Revision history for this message

Steve Langasek (vorlon) wrote on 2017-08-22:

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

lp://staging/~xnox/livecd-rootfs/force-resolved-stub-resolver updated on 2017-08-22