From 37d9b77b9519fbb9b3c05e14b7939af8a26b13cf Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Wed, 19 Dec 2018 10:06:27 +1100
Subject: [PATCH] subiquity: make subiqutiy_config.mount optional

Remove wants from local-fs.target, add wants from the uuid device instead.

Tested by applying these changes from pre-pivot-root by modifying
/root files in place whilst booting with break=bottom.
---
 live-build/ubuntu-server/hooks/032-installer-squashfs.binary     | 1 +
 .../systemd/system/local-fs.target.wants/subiquity_config.mount  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 120000 live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/subiquity_config.mount

diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
index 518fc724..cff32321 100755
--- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
+++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
@@ -45,6 +45,7 @@ mkdir -p "$INSTALLER_ROOT/etc/systemd/system/$DEVICE_UNIT_NAME.d"
 cat > "$INSTALLER_ROOT/etc/systemd/system/$DEVICE_UNIT_NAME.d/override.conf" <<EOF
 [Unit]
 JobRunningTimeoutSec=0s
+Wants=subiquity_config.mount
 EOF
 
 # Prepare installer layer.
diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/subiquity_config.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/subiquity_config.mount
deleted file mode 120000
index 9c22c100..00000000
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/subiquity_config.mount
+++ /dev/null
@@ -1 +0,0 @@
-../subiquity_config.mount
\ No newline at end of file