From e4b41272e202e6ea178e9752fe4967de9f33a5fb Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Mon, 18 Sep 2017 10:47:59 +1200 Subject: [PATCH] Import patches-unapplied version 2.458 to ubuntu/artful-proposed Imported using git-ubuntu import. Changelog parent: 7fd585146bdd0f08adaf5c9cc0e06c82626266d8 New changelog entries: * Move default netplan config for server-live image to where hook will pick it up. --- debian/changelog | 7 +++++++ .../ubuntu-server/hooks/032-installer-squashfs.binary | 2 +- .../{ => overlay}/etc/netplan/00-installer-config.yaml | 0 .../lib/systemd/system/getty@.service.d/autologin.conf | 0 .../system/multi-user.target.wants/subiquity.service | 0 .../lib/systemd/system/subiquity-debug@.service | 0 .../lib/systemd/system/subiquity.service | 0 7 files changed, 8 insertions(+), 1 deletion(-) rename live-build/ubuntu-server/includes.binary/{ => overlay}/etc/netplan/00-installer-config.yaml (100%) rename live-build/ubuntu-server/includes.binary/{boot/overlay.dir => overlay}/lib/systemd/system/getty@.service.d/autologin.conf (100%) rename live-build/ubuntu-server/includes.binary/{boot/overlay.dir => overlay}/lib/systemd/system/multi-user.target.wants/subiquity.service (100%) rename live-build/ubuntu-server/includes.binary/{boot/overlay.dir => overlay}/lib/systemd/system/subiquity-debug@.service (100%) rename live-build/ubuntu-server/includes.binary/{boot/overlay.dir => overlay}/lib/systemd/system/subiquity.service (100%) diff --git a/debian/changelog b/debian/changelog index 7d11df60..a72bd105 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.458) artful; urgency=medium + + * Move default netplan config for server-live image to where hook will + pick it up. + + -- Michael Hudson-Doyle Mon, 18 Sep 2017 10:47:59 +1200 + livecd-rootfs (2.457) artful; urgency=medium * Enable systemd-networkd by default. diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary index 8dfd54b8..216f1922 100755 --- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary +++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary @@ -24,7 +24,7 @@ fi . config/functions SQUASH_ROOT=binary/boot/squashfs.dir -OVERLAY_ROOT=binary/boot/overlay.dir +OVERLAY_ROOT=binary/overlay mkdir -p "$OVERLAY_ROOT" diff --git a/live-build/ubuntu-server/includes.binary/etc/netplan/00-installer-config.yaml b/live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml similarity index 100% rename from live-build/ubuntu-server/includes.binary/etc/netplan/00-installer-config.yaml rename to live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml diff --git a/live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/getty@.service.d/autologin.conf b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/getty@.service.d/autologin.conf similarity index 100% rename from live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/getty@.service.d/autologin.conf rename to live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/getty@.service.d/autologin.conf diff --git a/live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/multi-user.target.wants/subiquity.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/multi-user.target.wants/subiquity.service similarity index 100% rename from live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/multi-user.target.wants/subiquity.service rename to live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/multi-user.target.wants/subiquity.service diff --git a/live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity-debug@.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service similarity index 100% rename from live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity-debug@.service rename to live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity-debug@.service diff --git a/live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service similarity index 100% rename from live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity.service rename to live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service