diff -Nru friendly-recovery-0.2.38ubuntu1.1/debian/changelog friendly-recovery-0.2.38ubuntu1.2/debian/changelog --- friendly-recovery-0.2.38ubuntu1.1/debian/changelog 2019-06-25 12:52:16.000000000 +0000 +++ friendly-recovery-0.2.38ubuntu1.2/debian/changelog 2021-01-26 21:21:36.000000000 +0000 @@ -1,3 +1,11 @@ +friendly-recovery (0.2.38ubuntu1.2) bionic; urgency=medium + + * add resolvconf-pull-resolved.path to script that brings up the + network in order to resolve a conflict between systemd and + resolvconf (LP: #1891952) + + -- William 'jawn-smith' Wilson Tue, 26 Jan 2021 15:21:36 -0600 + friendly-recovery (0.2.38ubuntu1.1) bionic; urgency=medium [ Steven Clarkson ] diff -Nru friendly-recovery-0.2.38ubuntu1.1/lib/recovery-mode/options/network friendly-recovery-0.2.38ubuntu1.2/lib/recovery-mode/options/network --- friendly-recovery-0.2.38ubuntu1.1/lib/recovery-mode/options/network 2018-10-15 13:00:35.000000000 +0000 +++ friendly-recovery-0.2.38ubuntu1.2/lib/recovery-mode/options/network 2021-01-26 21:21:36.000000000 +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..."