From ed2e262a68fb1b04d9ee0d42f776ec21970f447b Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Tue, 3 Nov 2020 08:25:01 -0500
Subject: [PATCH] Separate citadel.live and citadel.install boot modes

---
 .../files/systemd/citadel-installer-backend.service      | 3 +--
 .../files/systemd/installer-session-switcher.service     | 3 +--
 .../recipes-citadel/images/citadel-installer-image.bb    | 9 ++++-----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/meta-citadel/recipes-citadel/citadel-config/files/systemd/citadel-installer-backend.service b/meta-citadel/recipes-citadel/citadel-config/files/systemd/citadel-installer-backend.service
index 8c9586a..3e83873 100644
--- a/meta-citadel/recipes-citadel/citadel-config/files/systemd/citadel-installer-backend.service
+++ b/meta-citadel/recipes-citadel/citadel-config/files/systemd/citadel-installer-backend.service
@@ -1,8 +1,7 @@
 [Unit]
 Description=Citadel Installer Backend
 
-ConditionKernelCommandLine=|citadel.install
-ConditionKernelCommandLine=|citadel.live
+ConditionKernelCommandLine=citadel.install
 
 [Service]
 
diff --git a/meta-citadel/recipes-citadel/citadel-config/files/systemd/installer-session-switcher.service b/meta-citadel/recipes-citadel/citadel-config/files/systemd/installer-session-switcher.service
index ed4f2b2..98bbae7 100644
--- a/meta-citadel/recipes-citadel/citadel-config/files/systemd/installer-session-switcher.service
+++ b/meta-citadel/recipes-citadel/citadel-config/files/systemd/installer-session-switcher.service
@@ -3,8 +3,7 @@ Description=Citadel Installer Session Switcher
 After=accounts-daemon.service
 Wants=accounts-daemon.service
 
-ConditionKernelCommandLine=|citadel.installer
-ConditionKernelCommandLine=|citadel.live
+ConditionKernelCommandLine=citadel.install
 
 [Service]
 Type=oneshot
diff --git a/meta-citadel/recipes-citadel/images/citadel-installer-image.bb b/meta-citadel/recipes-citadel/images/citadel-installer-image.bb
index 258da54..9735a51 100644
--- a/meta-citadel/recipes-citadel/images/citadel-installer-image.bb
+++ b/meta-citadel/recipes-citadel/images/citadel-installer-image.bb
@@ -38,7 +38,7 @@ install_efi_files() {
 
     install -d ${IMAGE_ROOTFS}/loader/entries
     make_loader_conf > ${IMAGE_ROOTFS}/loader/loader.conf
-    make_live_conf > ${IMAGE_ROOTFS}/loader/entries/live.conf
+    make_install_conf > ${IMAGE_ROOTFS}/loader/entries/install.conf
 }
 
 SYSLINUX_MODULES = "ldlinux.c32 menu.c32 libutil.c32 gptmbr.bin"
@@ -60,7 +60,7 @@ install_image_files() {
 }
 
 make_loader_conf() {
-    echo "default live"
+    echo "default install"
     echo "timeout 5"
 }
 
@@ -83,14 +83,14 @@ cat << EOF
 UI menu.c32
 PROMPT 0
 
-MENU TITLE Boot Live Subgraph OS (Citadel)
+MENU TITLE Boot Subgraph OS Installer (Citadel)
 TIMEOUT 50
 DEFAULT subgraph
 
 LABEL subgraph
         MENU LABEL Subgraph OS
 	LINUX ../bzImage-${CITADEL_KERNEL_VERSION}
-	APPEND ${KERNEL_CMDLINE} citadel.live
+	APPEND ${KERNEL_CMDLINE} citadel.install
 EOF
 }
 
@@ -136,7 +136,6 @@ write_boot_image() {
     IMAGE_SIZE=$(expr ${BLOCKS_ROOTFS} + ${BLOCKS_EXTRA})
 
     if [ -e ${IMAGE_PATH} ]; then
-        
         rm ${IMAGE_PATH}
     fi