livecd-rootfs

Merge lp:~mwhudson/livecd-rootfs/short-circuit-systemd-networkd-wait-online into lp:livecd-rootfs

  1. short-circuit-systemd-networkd-wait-online
  2. Merge into trunk
Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: 1671
Proposed branch: lp:~mwhudson/livecd-rootfs/short-circuit-systemd-networkd-wait-online
Merge into: lp:livecd-rootfs
Diff against target: 32 lines (+8/-2)
2 files modified
debian/changelog (+8/-0)
live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml (+0/-2)
To merge this branch: bzr merge lp:~mwhudson/livecd-rootfs/short-circuit-systemd-networkd-wait-online
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+344815@code.launchpad.net

Description of the change

I guess if we do this we could remove optional: true from the netplan config, should we?

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

Yes, this looks like what I would expect here.

review: Approve
Revision history for this message
Steve Langasek (vorlon) wrote :

> I guess if we do this we could remove optional: true from the netplan config, should we?

For the netplan config that's only in the live system, I don't think it makes a difference either way.

lp:~mwhudson/livecd-rootfs/short-circuit-systemd-networkd-wait-online updated
1670. By Michael Hudson-Doyle

remove "optional: true" from 00-installer-config.yaml

1671. By Michael Hudson-Doyle

merge trunk

1672. By Michael Hudson-Doyle

update changelog

1673. By Michael Hudson-Doyle

fix mis-merge

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 2018-05-16 21:11:32 +0000
3+++ debian/changelog 2018-05-23 02:26:35 +0000
4@@ -1,3 +1,11 @@
5+livecd-rootfs (2.527) UNRELEASED; urgency=medium
6+
7+ * Symlink systemd-networkd-wait-online to /bin/true in the live installer
8+ live session to avoid depending on buggy systemd behaviour.
9+ * Remove "optional: true" from installer netplan config.
10+
11+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Mon, 30 Apr 2018 20:00:02 +1200
12+
13 livecd-rootfs (2.526) cosmic; urgency=medium
14
15 * Drop Lubuntu Next now that Lubuntu Next is Lubuntu.
16
17=== modified file 'live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml'
18--- live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml 2018-04-03 13:56:34 +0000
19+++ live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml 2018-05-23 02:26:35 +0000
20@@ -7,9 +7,7 @@
21 match:
22 name: "en*"
23 dhcp4: true
24- optional: true
25 all-eth:
26 match:
27 name: "eth*"
28 dhcp4: true
29- optional: true
30
31=== added symlink 'live-build/ubuntu-server/includes.binary/overlay/lib/systemd/systemd-networkd-wait-online'
32=== target is u'/bin/true'

Subscribers

People subscribed via source and target branches