From 9c9dbda327526f7423a303affdcf60cfe36c3069 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Thu, 14 Sep 2017 17:17:57 +0100 Subject: [PATCH] * Enable systemd-networkd by default. - Usually, netplan's systemd-generator enables systemd-networkd and systemd-networkd-wait-online on boot. But netplan configuration is not yet generated at that point by cloud-init. Cloud-init generates in the network-pre.target and expects the network.target / network-online.target to work. These are already part of the ongoing systemd transaction, thus cannot be injected into the boot-sequency by cloud-init local mode. Therefore make sure cloud images include networkd in the initial boot transaction. - src:systemd will shortly not enable networkd unconditionally by default. * Drop ifupdown e-n-i configuration files, no longer used. --- debian/changelog | 17 +++++++++++++++++ .../includes.chroot/etc/network/interfaces | 12 ------------ .../systemd-networkd.service | 1 + .../systemd-networkd-wait-online.service | 1 + .../systemd-networkd.socket | 1 + 5 files changed, 20 insertions(+), 12 deletions(-) delete mode 100644 live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces create mode 120000 live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service create mode 120000 live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service create mode 120000 live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket diff --git a/debian/changelog b/debian/changelog index 3d43209f..8e43f1c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +livecd-rootfs (2.457) UNRELEASED; urgency=medium + + * Enable systemd-networkd by default. + - Usually, netplan's systemd-generator enables systemd-networkd and + systemd-networkd-wait-online on boot. But netplan configuration is not + yet generated at that point by cloud-init. Cloud-init generates in the + network-pre.target and expects the network.target / + network-online.target to work. These are already part of the ongoing + systemd transaction, thus cannot be injected into the boot-sequency by + cloud-init local mode. Therefore make sure cloud images include + networkd in the initial boot transaction. + - src:systemd will shortly not enable networkd unconditionally by + default. + * Drop ifupdown e-n-i configuration files, no longer used. + + -- Dimitri John Ledkov Thu, 14 Sep 2017 17:14:37 +0100 + livecd-rootfs (2.456) artful; urgency=medium * Improve teardown_mountpoint to recursively find all submounts and diff --git a/live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces b/live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces deleted file mode 100644 index bb161e72..00000000 --- a/live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces +++ /dev/null @@ -1,12 +0,0 @@ -# This file describes the network interfaces available on your system -# and how to activate them. For more information, see interfaces(5). - -# The loopback network interface -auto lo -iface lo inet loopback - -# Source interfaces -# Please check /etc/network/interfaces.d before changing this file -# as interfaces may have been defined in /etc/network/interfaces.d -# See LP: #1262951 -source /etc/network/interfaces.d/*.cfg diff --git a/live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service b/live-build/ubuntu-cpc/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-cpc/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-cpc/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service b/live-build/ubuntu-cpc/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-cpc/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-cpc/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket new file mode 120000 index 00000000..bcfcdbac --- /dev/null +++ b/live-build/ubuntu-cpc/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