friendly-recovery

Merge lp:~jawn-smith/friendly-recovery/systemd-resolvconf-conflict into lp:~ubuntu-core-dev/friendly-recovery/ubuntu

  1. systemd-resolvconf-conflict
  2. Merge into ubuntu
Proposed by William Wilson
Status: Merged
Merged at revision: 167
Proposed branch: lp:~jawn-smith/friendly-recovery/systemd-resolvconf-conflict
Merge into: lp:~ubuntu-core-dev/friendly-recovery/ubuntu
Diff against target: 35 lines (+7/-2)
2 files modified
debian/changelog (+6/-1)
lib/recovery-mode/options/network (+1/-1)
To merge this branch: bzr merge lp:~jawn-smith/friendly-recovery/systemd-resolvconf-conflict
Reviewer Review Type Date Requested Status
Brian Murray Needs Information
Dimitri John Ledkov lgtm Approve
Review via email: mp+396944@code.launchpad.net

Description of the change

Adding resolvconf-pull-resolved.path to the network script. This resolves a conflict between systemd-resolved and resolvconf that was resulting in failed DNS resolution in friendly recovery mode.

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) :
review: Approve (lgtm)
lp:~jawn-smith/friendly-recovery/systemd-resolvconf-conflict updated
168. By William Wilson

Reverting the maintainer as this will go to debian

Revision history for this message
Brian Murray (brian-murray) wrote :

What will happen in the event that "resolvconf-pull-resolved.path" does not exist on disk? Will systemctl start exit abnormally?

review: Needs Information

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 2020-01-16 01:18:17 +0000
3+++ debian/changelog 2021-01-26 18:23:58 +0000
4@@ -1,12 +1,17 @@
5 friendly-recovery (0.2.42) UNRELEASED; urgency=medium
6
7+ [ Debian Janitor ]
8 * Trim trailing whitespace.
9 * Add missing build dependency on dh addon.
10 * Bump debhelper from old 10 to 12.
11 * Set debhelper-compat version in Build-Depends.
12 * Use secure URI in Vcs control header Vcs-Bzr.
13
14- -- Debian Janitor <janitor@jelmer.uk> Thu, 16 Jan 2020 01:13:13 +0000
15+ [ William 'jawn-smith' Wilson ]
16+ * add resolvconf-pull-resolved.path to script that brings up the
17+ network (LP: #1891952)
18+
19+ -- William 'jawn-smith' Wilson <william.wilson@canonical.com> Tue, 26 Jan 2021 10:53:47 -0600
20
21 friendly-recovery (0.2.41) experimental; urgency=medium
22
23
24=== modified file 'lib/recovery-mode/options/network'
25--- lib/recovery-mode/options/network 2018-10-02 17:25:01 +0000
26+++ lib/recovery-mode/options/network 2021-01-26 18:23:58 +0000
27@@ -22,7 +22,7 @@
28 # Try handling networking using systemd
29 if [ -d /run/systemd/system ]; then
30 echo "Enabling networking..."
31- for i in dbus.socket systemd-udevd.service systemd-sysctl.service systemd-resolved.service networking.service systemd-networkd.service NetworkManager.service; do
32+ for i in dbus.socket systemd-udevd.service systemd-sysctl.service resolvconf-pull-resolved.path systemd-resolved.service networking.service systemd-networkd.service NetworkManager.service; do
33 systemctl is-enabled -q $i && systemctl start --no-ask-password --job-mode=ignore-dependencies $i
34 done
35 echo "Waiting for networking to be configured..."

Subscribers

People subscribed via source and target branches