From 7c1c7a80c2eba1fd876808bd216f1b550c159aaa Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 21 Dec 2017 11:00:22 +1300 Subject: [PATCH] enable networkd for live-server systems the logic for doing this is the same as why it is done for cloud-images, for which see http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/revision/1520 I think this behaviour is a bug in cloud-init (see lp:#1737630) but this is a good workaround in the mean time --- debian/changelog | 6 ++++++ .../system/multi-user.target.wants/systemd-networkd.service | 1 + .../systemd-networkd-wait-online.service | 1 + .../system/sockets.target.wants/systemd-networkd.socket | 1 + 4 files changed, 9 insertions(+) create mode 120000 live-build/ubuntu-server/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service create mode 120000 live-build/ubuntu-server/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service create mode 120000 live-build/ubuntu-server/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket diff --git a/debian/changelog b/debian/changelog index 26cf864e..69fa6856 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.488) UNRELEASED; urgency=medium + + * Enable systemd-networkd by default for live-server installs. + + -- Michael Hudson-Doyle Thu, 21 Dec 2017 10:59:50 +1300 + livecd-rootfs (2.487) bionic; urgency=medium * Drop android-tools-fsutils dependency, and instead install it on diff --git a/live-build/ubuntu-server/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service b/live-build/ubuntu-server/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service new file mode 120000 index 00000000..3c55b243 --- /dev/null +++ b/live-build/ubuntu-server/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service @@ -0,0 +1 @@ +/lib/systemd/system/systemd-networkd.service \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service b/live-build/ubuntu-server/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service new file mode 120000 index 00000000..3b627c5c --- /dev/null +++ b/live-build/ubuntu-server/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service @@ -0,0 +1 @@ +/lib/systemd/system/systemd-networkd-wait-online.service \ No newline at end of file diff --git a/live-build/ubuntu-server/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/live-build/ubuntu-server/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket new file mode 120000 index 00000000..bcfcdbac --- /dev/null +++ b/live-build/ubuntu-server/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket @@ -0,0 +1 @@ +/lib/systemd/system/systemd-networkd.socket \ No newline at end of file