From 4941d4ee14bc27d08ee5dc7e4ab5e9ec2f94d919 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Mon, 18 Sep 2017 10:47:06 +1200 Subject: [PATCH 1/3] move default netplan to where the hook will pick it up (i hope) --- .../{ => boot/overlay.dir}/etc/netplan/00-installer-config.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename live-build/ubuntu-server/includes.binary/{ => boot/overlay.dir}/etc/netplan/00-installer-config.yaml (100%) diff --git a/live-build/ubuntu-server/includes.binary/etc/netplan/00-installer-config.yaml b/live-build/ubuntu-server/includes.binary/boot/overlay.dir/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/boot/overlay.dir/etc/netplan/00-installer-config.yaml From 233c96a87ffd7842d0e3ee3a971bf547e918896b Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Mon, 18 Sep 2017 10:48:36 +1200 Subject: [PATCH 2/3] add changelog entry --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7d11df60..61b95828 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.458) UNRELEASED; 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. From 98028438850d4c2ac94e6f10c77264c9326f7264 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 19 Sep 2017 19:18:09 +1200 Subject: [PATCH 3/3] make file paths a bit less comical --- live-build/ubuntu-server/hooks/032-installer-squashfs.binary | 2 +- .../etc/netplan/00-installer-config.yaml | 0 .../lib/systemd/system/getty@.service.d/autologin.conf | 0 .../systemd/system/multi-user.target.wants/subiquity.service | 0 .../lib/systemd/system/subiquity-debug@.service | 0 .../lib/systemd/system/subiquity.service | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename live-build/ubuntu-server/includes.binary/{boot/overlay.dir => 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/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/boot/overlay.dir/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/boot/overlay.dir/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