brl/citadel
1
0
Fork 2
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Separate citadel.live and citadel.install boot modes

Browse Source
This commit is contained in:
Bruce Leidl 2020-11-03 08:25:01 -05:00
parent bcbb599731
commit ed2e262a68
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-citadel/recipes-citadel/citadel-config/files/systemd/citadel-installer-backend.service
View File

@ -1,8 +1,7 @@
[Unit]
Description=Citadel Installer Backend
ConditionKernelCommandLine=|citadel.install
ConditionKernelCommandLine=|citadel.live
ConditionKernelCommandLine=citadel.install
[Service]

3
meta-citadel/recipes-citadel/citadel-config/files/systemd/installer-session-switcher.service
View File

@ -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

9
meta-citadel/recipes-citadel/images/citadel-installer-image.bb
View File

@ -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