diff --git a/biglinux-make-iso-profiles/base/live-overlay/usr/share/grub/cfg/kernels.cfg b/biglinux-make-iso-profiles/base/live-overlay/usr/share/grub/cfg/kernels.cfg index 70e58f38..f56aca5e 100644 --- a/biglinux-make-iso-profiles/base/live-overlay/usr/share/grub/cfg/kernels.cfg +++ b/biglinux-make-iso-profiles/base/live-overlay/usr/share/grub/cfg/kernels.cfg @@ -11,9 +11,9 @@ menuentry "" { set gfxpayload=keep } -submenu '3 Advanced options with Proprietary Drivers' $menuentry_id_option 'gnulinux-advanced-7ae0c6e3-f7c7-44e4-96e1-edeee79bc62b' { +submenu '3 Advanced options with Proprietary Drivers ->' { - submenu '3.0.0 Options to Hybrid GPU' $menuentry_id_option 'gnulinux-advanced-7ae0c6e3-f7c7-44e4-96e1-edeee79bc62b' { + submenu '3.0.0 Options to Hybrid GPU ->' { menuentry "3.0.1 Nvidia Hybrid Config 1" --class=@DIST_NAME@.@ARCH@ "$title" { linux /boot/vmlinuz-x86_64 misobasedir=manjaro misolabel=BIGLINUXLIVE driver=nonfree nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 amdgpu.modeset=1 nowatchdog tsc=nowatchdog cryptomgr.notests no_timer_check rcupdate.rcu_expedited=1 bgrt_disable video=efifb:off video=simplefb:off video=vesafb:off rw nosoftlockup audit=0 nomce skew_tick=1 intremap=off intel_pstate=active amd_pstate=passive cpuidle.governor=teo split_lock_detect=off clearcpuid=514 transparent_hugepage=never quiet loglevel=3 systemd.show_status=auto rd.udev.log_level=3 splash bignvidia=1 @@ -50,8 +50,6 @@ submenu '3 Advanced options with Proprietary Drivers' $menuentry_id_option 'gnul initrd /boot/amd_ucode.img /boot/intel_ucode.img /boot/initramfs-@ARCH@.img } } - - menuentry "3.1 Open in Installer" --class=@DIST_NAME@.@ARCH@ "$title" { linux /boot/vmlinuz-x86_64 misobasedir=manjaro misolabel=BIGLINUXLIVE driver=nonfree nvidia-drm.modeset=1 nouveau.modeset=0 i915.modeset=1 radeon.modeset=1 amdgpu.modeset=1 nowatchdog tsc=nowatchdog cryptomgr.notests no_timer_check rcupdate.rcu_expedited=1 bgrt_disable video=efifb:off video=simplefb:off video=vesafb:off rw nosoftlockup audit=0 nomce skew_tick=1 intremap=off intel_pstate=active amd_pstate=passive cpuidle.governor=teo split_lock_detect=off clearcpuid=514 transparent_hugepage=never quiet loglevel=3 systemd.show_status=auto rd.udev.log_level=3 splash biglinux.bootcmd=only-calamares @@ -146,16 +144,7 @@ submenu '3 Advanced options with Proprietary Drivers' $menuentry_id_option 'gnul } -submenu '4 Advanced options with Open Source Drivers' $menuentry_id_option 'gnulinux-advanced-7ae0c6e3-f7c7-44e4-96e1-edeee79bc62b' { - - title="" - for kopt in @ARCH@ $kopts @DEFAULT_ARGS@ @BOOT_ARGS@; do - if [ -n "$title" ] ; then - title="$title $kopt"; - else - title="$kopt"; - fi; - done +submenu '4 Advanced options with Open Source Drivers ->' { menuentry "4.1 Open in Installer" --class=@DIST_NAME@.@ARCH@ "$title" { linux /boot/vmlinuz-x86_64 misobasedir=manjaro misolabel=BIGLINUXLIVE driver=free nowatchdog tsc=nowatchdog cryptomgr.notests no_timer_check rcupdate.rcu_expedited=1 bgrt_disable video=efifb:off video=simplefb:off video=vesafb:off rw nosoftlockup audit=0 nomce skew_tick=1 intremap=off intel_pstate=active amd_pstate=passive cpuidle.governor=teo split_lock_detect=off clearcpuid=514 transparent_hugepage=never quiet loglevel=3 systemd.show_status=auto rd.udev.log_level=3 splash biglinux.bootcmd=only-calamares @@ -251,6 +240,19 @@ submenu '4 Advanced options with Open Source Drivers' $menuentry_id_option 'gnul } +function memtest_detect { + if ! is_efi; then + if [ -f /boot/memtest ]; then + menuentry "Run Memory Testing Tool (memtest86+)" --class memtest86 --class gnu --class tool {linux16 /boot/memtest} + fi + elif is_efi; then + if [ -f /boot/memtest-efi ]; then + menuentry "Run Memory Testing Tool (memtest86+)" --class memtest86 --class gnu --class tool {linux16 /boot/memtest-efi} + fi + fi +} + + menuentry "" { set gfxpayload=keep }