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
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-09-14 05:35:05 +0000
3+++ debian/changelog 2017-09-16 20:43:47 +0000
4@@ -1,3 +1,20 @@
5+livecd-rootfs (2.457) UNRELEASED; urgency=medium
6+
7+ * Enable systemd-networkd by default.
8+ - Usually, netplan's systemd-generator enables systemd-networkd and
9+ systemd-networkd-wait-online on boot. But netplan configuration is not
10+ yet generated at that point by cloud-init. Cloud-init generates in the
11+ network-pre.target and expects the network.target /
12+ network-online.target to work. These are already part of the ongoing
13+ systemd transaction, thus cannot be injected into the boot-sequency by
14+ cloud-init local mode. Therefore make sure cloud images include
15+ networkd in the initial boot transaction.
16+ - src:systemd will shortly not enable networkd unconditionally by
17+ default.
18+ * Drop ifupdown e-n-i configuration files, no longer used.
19+
20+ -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 14 Sep 2017 17:14:37 +0100
21+
22 livecd-rootfs (2.456) artful; urgency=medium
23
24 * Improve teardown_mountpoint to recursively find all submounts and
25
26=== removed directory 'live-build/ubuntu-cpc/includes.chroot/etc/network'
27=== removed file 'live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces'
28--- live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces 2016-04-14 18:03:18 +0000
29+++ live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces 1970-01-01 00:00:00 +0000
30@@ -1,12 +0,0 @@
31-# This file describes the network interfaces available on your system
32-# and how to activate them. For more information, see interfaces(5).
33-
34-# The loopback network interface
35-auto lo
36-iface lo inet loopback
37-
38-# Source interfaces
39-# Please check /etc/network/interfaces.d before changing this file
40-# as interfaces may have been defined in /etc/network/interfaces.d
41-# See LP: #1262951
42-source /etc/network/interfaces.d/*.cfg
43
44=== removed directory 'live-build/ubuntu-cpc/includes.chroot/etc/network/interfaces.d'
45=== added directory 'live-build/ubuntu-cpc/includes.chroot/etc/systemd'
46=== added directory 'live-build/ubuntu-cpc/includes.chroot/etc/systemd/system'
47=== added directory 'live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/multi-user.target.wants'
48=== added symlink 'live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service'
49=== target is u'/lib/systemd/system/systemd-networkd.service'
50=== added directory 'live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/network-online.target.wants'
51=== added symlink 'live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service'
52=== target is u'/lib/systemd/system/systemd-networkd-wait-online.service'
53=== added directory 'live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/sockets.target.wants'
54=== added symlink 'live-build/ubuntu-cpc/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket'
55=== target is u'/lib/systemd/system/systemd-networkd.socket'

Subscribers

People subscribed via source and target branches