diff -Nru friendly-recovery-0.2.41/debian/changelog friendly-recovery-0.2.41ubuntu0.20.04.1/debian/changelog --- friendly-recovery-0.2.41/debian/changelog 2019-06-21 07:29:33.000000000 -0500 +++ friendly-recovery-0.2.41ubuntu0.20.04.1/debian/changelog 2021-01-26 15:17:03.000000000 -0600 @@ -1,3 +1,11 @@ +friendly-recovery (0.2.41ubuntu0.20.04.1) focal; 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:17:03 -0600 + friendly-recovery (0.2.41) experimental; urgency=medium [ Janitor ] diff -Nru friendly-recovery-0.2.41/debian/control friendly-recovery-0.2.41ubuntu0.20.04.1/debian/control --- friendly-recovery-0.2.41/debian/control 2019-06-21 07:27:27.000000000 -0500 +++ friendly-recovery-0.2.41ubuntu0.20.04.1/debian/control 2021-01-26 15:17:03.000000000 -0600 @@ -1,7 +1,8 @@ Source: friendly-recovery Section: admin Priority: optional -Maintainer: Debian QA Group +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian QA Group Build-Depends: debhelper (>= 10) Standards-Version: 4.2.1 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/friendly-recovery/ubuntu diff -Nru friendly-recovery-0.2.41/lib/recovery-mode/options/network friendly-recovery-0.2.41ubuntu0.20.04.1/lib/recovery-mode/options/network --- friendly-recovery-0.2.41/lib/recovery-mode/options/network 2018-10-02 12:24:12.000000000 -0500 +++ friendly-recovery-0.2.41ubuntu0.20.04.1/lib/recovery-mode/options/network 2021-01-26 15:17:03.000000000 -0600 @@ -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..."