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

[William Wilson]

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.

[Dimitri John Ledkov (xnox)]

review: Approve (lgtm)

[lp:~jawn-smith/friendly-recovery/systemd-resolvconf-conflict]

168. By William Wilson on 2021-01-26

Reverting the maintainer as this will go to debian

[Brian Murray (brian-murray)]

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

review: Needs Information

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