diff -Nru netplan.io-0.96/debian/changelog netplan.io-0.96/debian/changelog --- netplan.io-0.96/debian/changelog 2019-03-07 22:07:27.000000000 +0000 +++ netplan.io-0.96/debian/changelog 2019-03-28 18:03:17.000000000 +0000 @@ -1,3 +1,14 @@ +netplan.io (0.96-0ubuntu0.18.04.2) bionic; urgency=medium + + * d/p/0001-Partially-revert-the-change-for-enabling-systemd-net.patch: + Partially revert changes to networkd jobs ordering: leave systemd-networkd + enabled in multi-user.target instead of network-online.target, as in some + minimal setups there might be no job requiring network-online.target, + whereas the natural target to reach for booting is multi-user.target. + (LP: #1821867) + + -- Mathieu Trudel-Lapierre Thu, 28 Mar 2019 14:03:17 -0400 + netplan.io (0.96-0ubuntu0.18.04.1) bionic; urgency=medium * Backport netplan.io 0.96 to 18.04. diff -Nru netplan.io-0.96/debian/patches/0001-Partially-revert-the-change-for-enabling-systemd-net.patch netplan.io-0.96/debian/patches/0001-Partially-revert-the-change-for-enabling-systemd-net.patch --- netplan.io-0.96/debian/patches/0001-Partially-revert-the-change-for-enabling-systemd-net.patch 1970-01-01 00:00:00.000000000 +0000 +++ netplan.io-0.96/debian/patches/0001-Partially-revert-the-change-for-enabling-systemd-net.patch 2019-03-28 18:03:17.000000000 +0000 @@ -0,0 +1,37 @@ +From ef43dd51c97923f53c4c61e2051785077b9e5e30 Mon Sep 17 00:00:00 2001 +From: Mathieu Trudel-Lapierre +Date: Thu, 28 Mar 2019 13:47:16 -0400 +Subject: [PATCH] Partially revert the change for enabling systemd-networkd. + network-online.target may not be depended on by anything on minimal images, + but multi-user.target already is. + +--- + src/networkd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: netplan.io-0.96/src/networkd.c +=================================================================== +--- netplan.io-0.96.orig/src/networkd.c ++++ netplan.io-0.96/src/networkd.c +@@ -814,7 +814,7 @@ cleanup_networkd_conf(const char* rootdi + void + enable_networkd(const char* generator_dir) + { +- g_autofree char* link = g_build_path(G_DIR_SEPARATOR_S, generator_dir, "network-online.target.wants", "systemd-networkd.service", NULL); ++ g_autofree char* link = g_build_path(G_DIR_SEPARATOR_S, generator_dir, "multi-user.target.wants", "systemd-networkd.service", NULL); + g_debug("We created networkd configuration, adding %s enablement symlink", link); + safe_mkdir_p_dir(link); + if (symlink("../systemd-networkd.service", link) < 0 && errno != EEXIST) { +Index: netplan.io-0.96/tests/generator/test_args.py +=================================================================== +--- netplan.io-0.96.orig/tests/generator/test_args.py ++++ netplan.io-0.96/tests/generator/test_args.py +@@ -125,7 +125,7 @@ class TestConfigArgs(TestBase): + + # should auto-enable networkd and -wait-online + self.assertTrue(os.path.islink(os.path.join( +- outdir, 'network-online.target.wants', 'systemd-networkd.service'))) ++ outdir, 'multi-user.target.wants', 'systemd-networkd.service'))) + self.assertTrue(os.path.islink(os.path.join( + outdir, 'network-online.target.wants', 'systemd-networkd-wait-online.service'))) + diff -Nru netplan.io-0.96/debian/patches/series netplan.io-0.96/debian/patches/series --- netplan.io-0.96/debian/patches/series 2019-03-07 22:05:05.000000000 +0000 +++ netplan.io-0.96/debian/patches/series 2019-03-28 18:03:17.000000000 +0000 @@ -1 +1,2 @@ glib_changes.patch +0001-Partially-revert-the-change-for-enabling-systemd-net.patch