Merge remote-tracking branch 'upstream/dev' into dev
This commit is contained in:
commit
1ecd4232bc
3 changed files with 11 additions and 4 deletions
|
|
@ -22,9 +22,15 @@ menuentry "Linux" {
|
||||||
initrd /arch/boot/amd_ucode.img
|
initrd /arch/boot/amd_ucode.img
|
||||||
initrd /arch/boot/x86_64/initramfs-linux.img
|
initrd /arch/boot/x86_64/initramfs-linux.img
|
||||||
options "archisobasedir=arch archisodevice=/dev/disk/by-uuid/_______ copytoram loglevel=3"
|
options "archisobasedir=arch archisodevice=/dev/disk/by-uuid/_______ copytoram loglevel=3"
|
||||||
|
submenuentry "Linux (Safe Video)" {
|
||||||
|
add_options "nomodeset i915.modeset=0 nouveau.modeset=0"
|
||||||
|
}
|
||||||
submenuentry "Linux (CLI)" {
|
submenuentry "Linux (CLI)" {
|
||||||
add_options "nox"
|
add_options "nox"
|
||||||
}
|
}
|
||||||
|
submenuentry "Linux (CLI w/ Safe Video)" {
|
||||||
|
add_options "nox nomodeset i915.modeset=0 nouveau.modeset=0"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
menuentry "MemTest86+" {
|
menuentry "MemTest86+" {
|
||||||
|
|
|
||||||
|
|
@ -8,14 +8,14 @@ LINUX /arch/boot/x86_64/vmlinuz-linux
|
||||||
INITRD /arch/boot/intel-ucode.img,/arch/boot/amd-ucode.img,/arch/boot/x86_64/initramfs-linux.img
|
INITRD /arch/boot/intel-ucode.img,/arch/boot/amd-ucode.img,/arch/boot/x86_64/initramfs-linux.img
|
||||||
APPEND archisobasedir=arch archisodevice=/dev/disk/by-uuid/_______ copytoram loglevel=3
|
APPEND archisobasedir=arch archisodevice=/dev/disk/by-uuid/_______ copytoram loglevel=3
|
||||||
|
|
||||||
LABEL wk_linux_cli
|
LABEL wk_linux_safe
|
||||||
TEXT HELP
|
TEXT HELP
|
||||||
A live Linux environment (CLI)
|
A live Linux environment (Safe Video)
|
||||||
* HW diagnostics, file-based backups, data recovery, etc
|
* HW diagnostics, file-based backups, data recovery, etc
|
||||||
ENDTEXT
|
ENDTEXT
|
||||||
MENU LABEL Linux (CLI)
|
MENU LABEL Linux (Safe Video)
|
||||||
LINUX /arch/boot/x86_64/vmlinuz-linux
|
LINUX /arch/boot/x86_64/vmlinuz-linux
|
||||||
INITRD /arch/boot/intel-ucode.img,/arch/boot/amd-ucode.img,/arch/boot/x86_64/initramfs-linux.img
|
INITRD /arch/boot/intel-ucode.img,/arch/boot/amd-ucode.img,/arch/boot/x86_64/initramfs-linux.img
|
||||||
APPEND archisobasedir=arch archisodevice=/dev/disk/by-uuid/_______ copytoram nox
|
APPEND archisobasedir=arch archisodevice=/dev/disk/by-uuid/_______ copytoram nomodeset i915.modeset=0 nouveau.modeset=0
|
||||||
SYSAPPEND 3
|
SYSAPPEND 3
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,3 +5,4 @@ TEXT HELP
|
||||||
Perform RAM diagnostics
|
Perform RAM diagnostics
|
||||||
ENDTEXT
|
ENDTEXT
|
||||||
LINUX memtest.bin
|
LINUX memtest.bin
|
||||||
|
APPEND nobigstatus nopause
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue