From efc2a85da50a1f5e7140836ee20a9482813bea2b Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Mon, 6 Apr 2020 23:23:01 +0000 Subject: [PATCH] Imported 2.657 No reason for CPC update specified. --- debian/changelog | 7 +++++++ .../includes.binary/overlay/etc/cloud/cloud.cfg | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 74fc91e6..d123f41c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.657) focal; urgency=medium + + * server: networkd applies the first sorted matching network file, thus + prefix 'all' fallback networks with 'zz-'. + + -- Dimitri John Ledkov Fri, 03 Apr 2020 13:02:56 +0100 + livecd-rootfs (2.656) focal; urgency=medium [ David Krauser ] diff --git a/live-build/ubuntu-server/includes.binary/overlay/etc/cloud/cloud.cfg b/live-build/ubuntu-server/includes.binary/overlay/etc/cloud/cloud.cfg index 33d15fee..3756203e 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/etc/cloud/cloud.cfg +++ b/live-build/ubuntu-server/includes.binary/overlay/etc/cloud/cloud.cfg @@ -25,11 +25,11 @@ chpasswd: network: version: 2 ethernets: - all-en: + zz-all-en: match: name: "en*" dhcp4: true - all-eth: + zz-all-eth: match: name: "eth*" dhcp4: true