From a24eb25b005afccb8603c235a1b68d19736c03c0 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 23 May 2018 14:27:01 +1200 Subject: [PATCH] Import patches-unapplied version 2.527 to ubuntu/cosmic-proposed Imported using git-ubuntu import. Changelog parent: a4e3e38884e7e5f658e6b9c920cd94fc8f88e92c New changelog entries: * 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. --- debian/changelog | 8 ++++++++ .../overlay/etc/netplan/00-installer-config.yaml | 2 -- .../overlay/lib/systemd/systemd-networkd-wait-online | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) 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 e3aa5680..e563adb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.527) cosmic; 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 Wed, 23 May 2018 14:27:01 +1200 + livecd-rootfs (2.526) cosmic; urgency=medium * Drop Lubuntu Next now that Lubuntu Next is Lubuntu. 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 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