VERSION

@@ -1 +1 @@
-25.6.4
+25.6.3

files/initrd/opt/rr/include/consts.sh

@@ -8,7 +8,7 @@
 
 # shellcheck disable=SC2034
 
-RR_VERSION="25.6.4"
+RR_VERSION="25.6.3"
 RR_RELEASE=""
 RR_TITLE="RR v${RR_VERSION}"
 

files/mnt/p1/RR_VERSION

@@ -1 +1 @@
-25.6.4
+25.6.3

files/mnt/p1/boot/grub/grub.cfg

@@ -49,8 +49,6 @@ else
   font=${prefix}/fonts/unicode.pf2
 fi
 
-terminal_output console 
-
 if loadfont ${font}; then
   set gfxmode=auto
   load_video
@@ -58,9 +56,10 @@ if loadfont ${font}; then
   set locale_dir=$prefix/locale
   set lang=en_US
   insmod gettext
-  terminal_output --append gfxterm
 fi
 
+terminal_output gfxterm
+
 if serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1; then
   terminal_input --append serial
   terminal_output --append serial
@@ -73,6 +72,10 @@ set menu_color_highlight=black/cyan
 insmod png
 background_image ${prefix}/logo.png
 
+function gfxmode {
+	set gfxpayload="${linux_gfx_mode}"
+}
+
 set RR_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait intremap=off amd_iommu_intr=legacy net.ifnames=0 panic=5 split_lock_detect=off pcie_aspm=off intel_pstate=disable amd_pstate=disable nox2apic nomodeset nowatchdog"
 
 search --set=root --label "RR3"
@@ -86,7 +89,7 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
       load_env --skip-sig --file=${prefix}/rsysenv
     fi
     menuentry 'Boot DSM kernel directly' ${menuentry_id_option} direct {
-      set gfxpayload="${linux_gfx_mode}"
+      gfxmode
       echo "RRVersion: ${rr_version}"
       echo "${rr_booting}"
       echo -n "Boot Time: "; date
@@ -111,7 +114,7 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
     }
   fi
   menuentry 'Boot DSM' ${menuentry_id_option} boot {
-    set gfxpayload="${linux_gfx_mode}"
+    gfxmode
     echo "Loading kernel..."
     linux /bzImage-rr ${RR_CMDLINE} ${rr_cmdline}
     echo "Loading initramfs..."
@@ -119,7 +122,7 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
     echo "Booting..."
   }
   menuentry 'Boot Recovery' ${menuentry_id_option} recovery {
-    set gfxpayload="${linux_gfx_mode}"
+    gfxmode
     echo "Loading kernel..."
     linux /bzImage-rr ${RR_CMDLINE} ${rr_cmdline} recovery
     echo "Loading initramfs..."
@@ -127,7 +130,7 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
     echo "Booting..."
   }
   menuentry 'Force re-install DSM' ${menuentry_id_option} junior {
-    set gfxpayload="${linux_gfx_mode}"
+    gfxmode
     echo "Loading kernel..."
     linux /bzImage-rr ${RR_CMDLINE} ${rr_cmdline} force_junior
     echo "Loading initramfs..."
@@ -137,7 +140,7 @@ if [ -s /zImage-dsm -a -s /initrd-dsm ]; then
 fi
 
 menuentry 'Configure loader' ${menuentry_id_option} config {
-  set gfxpayload="${linux_gfx_mode}"
+  gfxmode
   echo "Loading kernel..."
   linux /bzImage-rr earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 ${RR_CMDLINE} ${rr_cmdline} IWANTTOCHANGETHECONFIG
   echo "Loading initramfs..."
@@ -146,7 +149,7 @@ menuentry 'Configure loader' ${menuentry_id_option} config {
 }
 
 menuentry 'Configure loader (verbose)' ${menuentry_id_option} verbose {
-  set gfxpayload="${linux_gfx_mode}"
+  gfxmode
   echo "Loading kernel..."
   linux /bzImage-rr ${RR_CMDLINE} ${rr_cmdline} earlycon=tty2 console=tty2 IWANTTOCHANGETHECONFIG
   echo "Loading initramfs..."