Merge pull request #4297 from mglae/le10_image_debug_shell

mkimage: replace deprecated "tty" with "systemd.debug_shell" for Generic
This commit is contained in:
CvH 2020-05-31 18:31:34 +02:00 committed by GitHub
commit 71faeb0cd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -129,15 +129,15 @@ PROMPT 1
LABEL installer LABEL installer
KERNEL /${KERNEL_NAME} KERNEL /${KERNEL_NAME}
APPEND boot=UUID=${UUID_SYSTEM} installer quiet tty vga=current APPEND boot=UUID=${UUID_SYSTEM} installer quiet systemd.debug_shell vga=current
LABEL live LABEL live
KERNEL /${KERNEL_NAME} KERNEL /${KERNEL_NAME}
APPEND boot=UUID=${UUID_SYSTEM} live quiet tty vga=current APPEND boot=UUID=${UUID_SYSTEM} live quiet vga=current
LABEL run LABEL run
KERNEL /${KERNEL_NAME} KERNEL /${KERNEL_NAME}
APPEND boot=UUID=${UUID_SYSTEM} disk=UUID=${UUID_STORAGE} tty portable quiet APPEND boot=UUID=${UUID_SYSTEM} disk=UUID=${UUID_STORAGE} portable quiet
EOF EOF
cat << EOF > "${LE_TMP}/grub.cfg" cat << EOF > "${LE_TMP}/grub.cfg"
@ -145,15 +145,15 @@ set timeout="25"
set default="Installer" set default="Installer"
menuentry "Installer" { menuentry "Installer" {
search --set -f /KERNEL search --set -f /KERNEL
linux /KERNEL boot=UUID=${UUID_SYSTEM} installer quiet tty vga=current linux /KERNEL boot=UUID=${UUID_SYSTEM} installer quiet systemd.debug_shell vga=current
} }
menuentry "Live" { menuentry "Live" {
search --set -f /KERNEL search --set -f /KERNEL
linux /KERNEL boot=UUID=${UUID_SYSTEM} grub_live quiet tty vga=current linux /KERNEL boot=UUID=${UUID_SYSTEM} grub_live quiet vga=current
} }
menuentry "Run" { menuentry "Run" {
search --set -f /KERNEL search --set -f /KERNEL
linux /KERNEL boot=UUID=${UUID_SYSTEM} disk=UUID=${UUID_STORAGE} tty grub_portable quiet linux /KERNEL boot=UUID=${UUID_SYSTEM} disk=UUID=${UUID_STORAGE} grub_portable quiet
} }
EOF EOF