Move default netplan config for server-live image to where hook will

pick it up.
7 years ago · f16f1c4229
parent 7b85fa69bb 9802843885
commit f16f1c4229
7 changed files with 8 additions and 1 deletions
--- 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 <mwhudson@debian.org>  Mon, 18 Sep 2017 10:47:59 +1200
 livecd-rootfs (2.457) artful; urgency=medium
  * Enable systemd-networkd by default.
--- 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"
--- a/live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml
+++ b/live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml
--- 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/boot/overlay.dir/lib/systemd/system/getty@.service.d/autologin.conf
--- 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/boot/overlay.dir/lib/systemd/system/multi-user.target.wants/subiquity.service
--- a/live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity-debug@.service
+++ b/live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity-debug@.service
--- a/live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity.service
+++ b/live-build/ubuntu-server/includes.binary/boot/overlay.dir/lib/systemd/system/subiquity.service