From eca9613bf380d6cac446143bafd6329b1dbdccf1 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Mon, 30 Apr 2018 20:01:54 +1200 Subject: [PATCH 1/4] Symlink systemd-networkd-wait-online to /bin/true in the live installer live session to avoid depending on buggy systemd behaviour. --- debian/changelog | 7 +++++++ .../overlay/lib/systemd/systemd-networkd-wait-online | 1 + 2 files changed, 8 insertions(+) create mode 120000 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/systemd-networkd-wait-online diff --git a/debian/changelog b/debian/changelog index 817e0429..10ac754c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.526) UNRELEASED; urgency=medium + + * Symlink systemd-networkd-wait-online to /bin/true in the live installer + live session to avoid depending on buggy systemd behaviour. + + -- Michael Hudson-Doyle Mon, 30 Apr 2018 20:00:02 +1200 + livecd-rootfs (2.525) bionic; urgency=medium * Don't fail to build CPC images if /lib/modules already exists in the diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/systemd-networkd-wait-online b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/systemd-networkd-wait-online new file mode 120000 index 00000000..63b10de4 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/systemd-networkd-wait-online @@ -0,0 +1 @@ +/bin/true \ No newline at end of file From 4bee7b18986b2d5e36c04db5cc2217ff3a47a1dc Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 22 May 2018 11:42:39 +1200 Subject: [PATCH 2/4] remove "optional: true" from 00-installer-config.yaml --- .../overlay/etc/netplan/00-installer-config.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml b/live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml index bfa19a26..b8399cb6 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml +++ b/live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml @@ -7,9 +7,7 @@ network: match: name: "en*" dhcp4: true - optional: true all-eth: match: name: "eth*" dhcp4: true - optional: true From 7ff90045b2afd060c468929907637c7015105f84 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 22 May 2018 11:45:10 +1200 Subject: [PATCH 3/4] update changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index bebfcefa..88657bbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ livecd-rootfs (2.527) UNRELEASED; urgency=medium * Symlink systemd-networkd-wait-online to /bin/true in the live installer live session to avoid depending on buggy systemd behaviour. + * Remove "optional: true" from installer netplan config. -- Michael Hudson-Doyle Mon, 30 Apr 2018 20:00:02 +1200 From 7c4d8ca173e7f3ce12349ce0eda0fff5a8899575 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 23 May 2018 14:26:02 +1200 Subject: [PATCH 4/4] fix mis-merge --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 88657bbd..1f9beeb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ livecd-rootfs (2.527) UNRELEASED; urgency=medium livecd-rootfs (2.526) cosmic; urgency=medium + * Drop Lubuntu Next now that Lubuntu Next is Lubuntu. + * Don't follow recommends on Lubuntu now that this is no longer the + case in the seed. + -- Simon Quigley Thu, 03 May 2018 23:18:52 -0500 livecd-rootfs (2.525) bionic; urgency=medium