From 064c9fe84b8ee6cce2098e7062b5cc2605ed6cf3 Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Thu, 24 Oct 2024 19:06:29 +0200 Subject: [PATCH] grub: cleanup Signed-off-by: AuxXxilium --- files/p1/boot/grub/grub.cfg | 27 +++++++++++---------------- files/p1/boot/grub/todo.txt | 5 ----- 2 files changed, 11 insertions(+), 21 deletions(-) delete mode 100644 files/p1/boot/grub/todo.txt diff --git a/files/p1/boot/grub/grub.cfg b/files/p1/boot/grub/grub.cfg index 5f7ac3f6..0ba34552 100644 --- a/files/p1/boot/grub/grub.cfg +++ b/files/p1/boot/grub/grub.cfg @@ -49,21 +49,16 @@ function load_video { load_video if loadfont unicode; then - if keystatus --shift; then true ; else - insmod gfxterm - set gfxmode=1024x768 - set gfxpayload=auto - terminal_output gfxterm - if terminal_output gfxterm; then true ; else - terminal gfxterm - fi - insmod gfxmenu - loadfont ${prefix}/theme/dejavu_bold_14.pf2 - loadfont ${prefix}/theme/dejavu_mono_12.pf2 - insmod png - set theme=${prefix}/theme/theme.txt - export theme - fi + insmod gfxterm + set gfxmode=1024x768 + set gfxpayload=auto + terminal_output gfxterm + insmod gfxmenu + loadfont ${prefix}/theme/dejavu_bold_14.pf2 + loadfont ${prefix}/theme/dejavu_mono_12.pf2 + insmod png + set theme=${prefix}/theme/theme.txt + export theme fi if serial --unit=0 --speed=115200; then @@ -83,7 +78,7 @@ set menu_color_normal=white/black set menu_color_highlight=white/red set color_normal=white/black -set ARC_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait net.ifnames=0 ipv6.disable=1" +set ARC_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait net.ifnames=0 panic=5 pcie_aspm=off intel_pstate=disable" search --set=root --label "ARC3" if [ -s /zImage-dsm -a -s /initrd-dsm ]; then diff --git a/files/p1/boot/grub/todo.txt b/files/p1/boot/grub/todo.txt deleted file mode 100644 index fb196d56..00000000 --- a/files/p1/boot/grub/todo.txt +++ /dev/null @@ -1,5 +0,0 @@ -Check: - -- numa=off -- pcie_aspm=off -- intremap=off (old -> working?) \ No newline at end of file