diff -Nru friendly-recovery-0.2.41/debian/changelog friendly-recovery-0.2.41ubuntu0.21.04.1/debian/changelog --- friendly-recovery-0.2.41/debian/changelog 2019-06-21 07:29:33.000000000 -0500 +++ friendly-recovery-0.2.41ubuntu0.21.04.1/debian/changelog 2021-01-26 12:35:58.000000000 -0600 @@ -1,3 +1,11 @@ +friendly-recovery (0.2.41ubuntu0.21.04.1) hirsute; 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 12:35:58 -0600 + friendly-recovery (0.2.41) experimental; urgency=medium [ Janitor ] diff -Nru friendly-recovery-0.2.41/debian/control friendly-recovery-0.2.41ubuntu0.21.04.1/debian/control --- friendly-recovery-0.2.41/debian/control 2019-06-21 07:27:27.000000000 -0500 +++ friendly-recovery-0.2.41ubuntu0.21.04.1/debian/control 2021-01-26 12:35:58.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/debian/patches/series friendly-recovery-0.2.41ubuntu0.21.04.1/debian/patches/series --- friendly-recovery-0.2.41/debian/patches/series 1969-12-31 18:00:00.000000000 -0600 +++ friendly-recovery-0.2.41ubuntu0.21.04.1/debian/patches/series 2021-01-26 12:35:58.000000000 -0600 @@ -0,0 +1 @@ +systemd-resolvconf-conflict.diff diff -Nru friendly-recovery-0.2.41/debian/patches/systemd-resolvconf-conflict.diff friendly-recovery-0.2.41ubuntu0.21.04.1/debian/patches/systemd-resolvconf-conflict.diff --- friendly-recovery-0.2.41/debian/patches/systemd-resolvconf-conflict.diff 1969-12-31 18:00:00.000000000 -0600 +++ friendly-recovery-0.2.41ubuntu0.21.04.1/debian/patches/systemd-resolvconf-conflict.diff 2021-01-26 12:35:58.000000000 -0600 @@ -0,0 +1,18 @@ +Description: Fix conflict between systemd and resolvconf +Author: William 'jawn-smith' Wilson +Origin: vendor, +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/friendly-recovery/+bug/1891952 +Last-Update: 2021-01-26 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/lib/recovery-mode/options/network ++++ b/lib/recovery-mode/options/network +@@ -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..." diff -Nru friendly-recovery-0.2.41/.pc/.quilt_patches friendly-recovery-0.2.41ubuntu0.21.04.1/.pc/.quilt_patches --- friendly-recovery-0.2.41/.pc/.quilt_patches 1969-12-31 18:00:00.000000000 -0600 +++ friendly-recovery-0.2.41ubuntu0.21.04.1/.pc/.quilt_patches 2021-01-26 12:35:58.000000000 -0600 @@ -0,0 +1 @@ +debian/patches diff -Nru friendly-recovery-0.2.41/.pc/.quilt_series friendly-recovery-0.2.41ubuntu0.21.04.1/.pc/.quilt_series --- friendly-recovery-0.2.41/.pc/.quilt_series 1969-12-31 18:00:00.000000000 -0600 +++ friendly-recovery-0.2.41ubuntu0.21.04.1/.pc/.quilt_series 2021-01-26 12:35:58.000000000 -0600 @@ -0,0 +1 @@ +series diff -Nru friendly-recovery-0.2.41/.pc/.version friendly-recovery-0.2.41ubuntu0.21.04.1/.pc/.version --- friendly-recovery-0.2.41/.pc/.version 1969-12-31 18:00:00.000000000 -0600 +++ friendly-recovery-0.2.41ubuntu0.21.04.1/.pc/.version 2021-01-26 12:35:58.000000000 -0600 @@ -0,0 +1 @@ +2