diff -Nru netplan.io-0.99/debian/changelog netplan.io-0.99/debian/changelog --- netplan.io-0.99/debian/changelog 2020-05-04 09:37:05.000000000 +0000 +++ netplan.io-0.99/debian/changelog 2020-05-28 21:09:51.000000000 +0000 @@ -1,3 +1,10 @@ +netplan.io (0.99-0ubuntu3~20.04.1ubuntu1) focal; urgency=medium + + * d/p/lp1875411-fix-process_link_changes.patch: + - Fix process_link_changes handling 'up' interfaces (LP: #1875411) + + -- Heitor Alves de Siqueira Thu, 28 May 2020 21:09:51 +0000 + netplan.io (0.99-0ubuntu3~20.04.1) focal; urgency=medium * Backport upstream bug fix for 0.99 to 20.04. (LP: #1871825) diff -Nru netplan.io-0.99/debian/patches/lp1875411-fix-process_link_changes.patch netplan.io-0.99/debian/patches/lp1875411-fix-process_link_changes.patch --- netplan.io-0.99/debian/patches/lp1875411-fix-process_link_changes.patch 1970-01-01 00:00:00.000000000 +0000 +++ netplan.io-0.99/debian/patches/lp1875411-fix-process_link_changes.patch 2020-05-28 21:09:51.000000000 +0000 @@ -0,0 +1,34 @@ +From 028f26f1fbef974284732480a92396550d118525 Mon Sep 17 00:00:00 2001 +From: Heitor Alves de Siqueira +Date: Thu, 28 May 2020 09:19:07 -0300 +Subject: [PATCH] Fix process_link_changes handling 'up' interfaces + +b7f1d9b04212 refactored process_link_changes with helper methods to get +the interface driver name and MAC address. This new code introduced a +regression where it's possible for an interface in the up state to be +included in the changelist by its MAC address. + +This patch restores the previous behaviour, skipping interfaces that +don't have driver_name set. + +Fixes: https://bugs.launchpad.net/bugs/1875411 +Origin: upstream, https://github.com/CanonicalLtd/netplan/commit/8f77deec17ce +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1875411 +--- + netplan/cli/commands/apply.py | 3 +++ + 1 file changed, 3 insertions(+) + +Index: netplan.io-0.99/netplan/cli/commands/apply.py +=================================================================== +--- netplan.io-0.99.orig/netplan/cli/commands/apply.py ++++ netplan.io-0.99/netplan/cli/commands/apply.py +@@ -244,6 +244,9 @@ class NetplanApply(utils.NetplanCommand) + continue + + driver_name = utils.get_interface_driver_name(interface, only_down=True) ++ if not driver_name: ++ # don't allow up interfaces to match by mac ++ continue + macaddress = utils.get_interface_macaddress(interface) + if driver_name in matches['by-driver']: + new_name = matches['by-driver'][driver_name] diff -Nru netplan.io-0.99/debian/patches/series netplan.io-0.99/debian/patches/series --- netplan.io-0.99/debian/patches/series 2020-05-04 09:37:05.000000000 +0000 +++ netplan.io-0.99/debian/patches/series 2020-05-28 21:02:04.000000000 +0000 @@ -1 +1,2 @@ 0001-Fix-LP-1874377-Not-connect-to-WiFi-after-netplan-app.patch +lp1875411-fix-process_link_changes.patch