Merge lp:~xnox/livecd-rootfs/networkd into lp:livecd-rootfs

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 1520
Proposed branch: lp:~xnox/livecd-rootfs/networkd
Merge into: lp:livecd-rootfs
Diff against target: 55 lines (+17/-12)
2 files modified
debian/changelog (+17/-0)
live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces (+0/-12)
To merge this branch: bzr merge lp:~xnox/livecd-rootfs/networkd
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Approve
Canonical Foundations Team Pending
Review via email: mp+330887@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Performed test livefs build.
Uploaded to canonistack.
Executed cloud-test-builder.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2017-09-14 05:35:05 +0000
+++ debian/changelog 2017-09-16 20:43:47 +0000
@@ -1,3 +1,20 @@
1livecd-rootfs (2.457) UNRELEASED; urgency=medium
2
3 * Enable systemd-networkd by default.
4 - Usually, netplan's systemd-generator enables systemd-networkd and
5 systemd-networkd-wait-online on boot. But netplan configuration is not
6 yet generated at that point by cloud-init. Cloud-init generates in the
7 network-pre.target and expects the network.target /
8 network-online.target to work. These are already part of the ongoing
9 systemd transaction, thus cannot be injected into the boot-sequency by
10 cloud-init local mode. Therefore make sure cloud images include
11 networkd in the initial boot transaction.
12 - src:systemd will shortly not enable networkd unconditionally by
13 default.
14 * Drop ifupdown e-n-i configuration files, no longer used.
15
16 -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 14 Sep 2017 17:14:37 +0100
17
1livecd-rootfs (2.456) artful; urgency=medium18livecd-rootfs (2.456) artful; urgency=medium
219
3 * Improve teardown_mountpoint to recursively find all submounts and20 * Improve teardown_mountpoint to recursively find all submounts and
421
=== removed directory 'live-build/ubuntu-cpc/includes.chroot/etc/network'
=== removed file 'live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces'
--- live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces 2016-04-14 18:03:18 +0000
+++ live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1# This file describes the network interfaces available on your system
2# and how to activate them. For more information, see interfaces(5).
3
4# The loopback network interface
5auto lo
6iface lo inet loopback
7
8# Source interfaces
9# Please check /etc/network/interfaces.d before changing this file
10# as interfaces may have been defined in /etc/network/interfaces.d
11# See LP: #1262951
12source /etc/network/interfaces.d/*.cfg
130
=== removed directory 'live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces.d'
=== added directory 'live-build/ubuntu-cpc/includes.chroot/etc/systemd'
=== added directory 'live-build/ubuntu-cpc/includes.chroot/etc/systemd/system'
=== added directory 'live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/multi-user.target.wants'
=== added symlink 'live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service'
=== target is u'/lib/systemd/system/systemd-networkd.service'
=== added directory 'live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/network-online.target.wants'
=== added symlink 'live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service'
=== target is u'/lib/systemd/system/systemd-networkd-wait-online.service'
=== added directory 'live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/sockets.target.wants'
=== added symlink 'live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket'
=== target is u'/lib/systemd/system/systemd-networkd.socket'

Subscribers

People subscribed via source and target branches