master: Request installer booting from the ISO image

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/bricklayer-master.in b/src/bricklayer-master.in
index 61b32c7b2352ba3e9e21723b3d819bb1619916de..2249bd1ea0da09f8bbc2d49d82385d88b17602b0 100644 (file)
--- a/src/bricklayer-master.in
+++ b/src/bricklayer-master.in
@@ -202,13 +202,13 @@ set default=0
 set timeout=60
 
 menuentry 'Install ${name} (${arch})' --class ${class} --id install {
-       linux /boot/vmlinuz ${commandline[@]}
+       linux /boot/vmlinuz ${commandline[@]} installer
        initrd /boot/initramfs.img
 }
 
 submenu 'Other Installation Options -->' {
        menuentry 'Unattended installation' --class ${class} --id install.unattended {
-               linux /boot/vmlinuz ${commandline[@]} installer.unattended
+               linux /boot/vmlinuz ${commandline[@]} installer installer.unattended
                initrd /boot/initramfs.img
        }
 }

diff --git a/src/systemd/bricklayer.service.in b/src/systemd/bricklayer.service.in
index 852fff1097f13f09bdecc263b3ea44cd900178f4..a18fbff6925afc0a1a31d00853246ea876a32766 100644 (file)
--- a/src/systemd/bricklayer.service.in
+++ b/src/systemd/bricklayer.service.in
@@ -7,7 +7,7 @@ Wants=getty-pre.target
 # prevent getty from running on any consoles before we are done
 Before=getty-pre.target
 Conflicts=plymouth-quit-wait.service bricklayer.service
-ConditionKernelCommandLine=install
+ConditionKernelCommandLine=installer
 
 [Service]
 Type=oneshot