VERSION

@@ -1 +1 @@
-24.12.2
+24.12.1

docs/modules.json

@@ -8,10 +8,6 @@
             "description": "RealTek RTL-8139 Fast Ethernet driver",
             "depends": "mii"
         },
-        "8390": {
-            "description": "",
-            "depends": ""
-        },
         "aacraid": {
             "description": "Dell PERC2, 2/Si, 3/Si, 3/Di, Adaptec Advanced Raid Products, HP NetRAID-4M, IBM ServeRAID & ICP SCSI driver (Compiled by RR for DSM)",
             "depends": ""
@@ -652,10 +648,6 @@
             "description": "Driver for NCT6775F and compatible chips (Compiled by RR for DSM)",
             "depends": "hwmon-vid"
         },
-        "ne2k-pci": {
-            "description": "PCI NE2000 clone driver",
-            "depends": "8390"
-        },
         "netxen_nic": {
             "description": "QLogic/NetXen (1/10) GbE Intelligent Ethernet Driver",
             "depends": ""

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

@@ -1,4 +1,4 @@
-RR_VERSION="24.12.2"
+RR_VERSION="24.12.1"
 RR_RELEASE=""
 RR_TITLE="RR v${RR_VERSION}"
 

files/initrd/opt/rr/menu.sh

@@ -2781,9 +2781,9 @@ function changePorts() {
         --infobox "$(TEXT "Setting ...")" 20 100
       # save to rrorg.conf
       rm -f "/etc/rrorg.conf"
-      [ ! "${HTTP:-7080}" = "7080" ] && echo "HTTP_PORT=${HTTP}" >>"/etc/rrorg.conf"
-      [ ! "${DUFS:-7304}" = "7304" ] && echo "DUFS_PORT=${DUFS}" >>"/etc/rrorg.conf"
-      [ ! "${TTYD:-7681}" = "7681" ] && echo "TTYD_PORT=${TTYD}" >>"/etc/rrorg.conf"
+      [ ! "${HTTP:-7080}" = "7080" ] && (echo "HTTP_PORT=${HTTP}" >>"/etc/rrorg.conf" && /etc/init.d/S90thttpd restart >/dev/null 2>&1)
+      [ ! "${DUFS:-7304}" = "7304" ] && (echo "DUFS_PORT=${DUFS}" >>"/etc/rrorg.conf" && /etc/init.d/S99dufs restart >/dev/null 2>&1)
+      [ ! "${TTYD:-7681}" = "7681" ] && (echo "TTYD_PORT=${TTYD}" >>"/etc/rrorg.conf" && /etc/init.d/S99ttyd restart >/dev/null 2>&1)
       # save to rru
       local RDXZ_PATH="${TMP_PATH}/rdxz_tmp"
       rm -rf "${RDXZ_PATH}"
@@ -2826,11 +2826,6 @@ function changePorts() {
         rm -f "${RR_RAMUSER_FILE}"
       fi
       rm -rf "${RDXZ_PATH}"
-      {
-        [ ! "${HTTP:-7080}" = "7080" ] && /etc/init.d/S90thttpd restart
-        [ ! "${DUFS:-7304}" = "7304" ] && /etc/init.d/S99dufs restart
-        [ ! "${TTYD:-7681}" = "7681" ] && /etc/init.d/S99ttyd restart
-      } >/dev/null 2>&1 &
       [ ! -f "/etc/rrorg.conf" ] && MSG="$(TEXT "Ports for TTYD/DUFS/HTTP restored.")" || MSG="$(TEXT "Ports for TTYD/DUFS/HTTP changed.")"
       DIALOG --title "$(TEXT "Settings")" \
         --msgbox "${MSG}" 0 0

files/mnt/p1/RR_VERSION

@@ -1 +1 @@
-24.12.2
+24.12.1

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

@@ -1,14 +1,30 @@
+insmod search
+insmod echo
+insmod terminal
+insmod test
+insmod font
+insmod loadenv
+insmod serial
+insmod usb_keyboard
+insmod linux
+insmod gzio
+insmod fat
+insmod ext2
+insmod ata
+insmod btrfs
+insmod ntfs
+insmod part_msdos
+insmod part_gpt
+insmod png
+insmod jpeg
+
 set default="boot"
 set timeout="5"
 set timeout_style="menu"
-set pager=1
 set vesa_mode=1
-set color_normal=white/black
-set menu_color_normal=light-cyan/black
-set menu_color_highlight=black/cyan
 
-if [ -s ${prefix}/grubenv ]; then
-  load_env --skip-sig
+if [ -s $prefix/grubenv ]; then
+  load_env
 fi
 if [ "${next_entry}" ]; then
   set default="${next_entry}"
@@ -19,36 +35,37 @@ if [ "${vesa_mode}" ]; then
   set vesa_mode=${vesa_mode}
 fi
 
-terminal_input console
-terminal_output console
-
-if [ "${feature_all_video_module}" = "y" ]; then
+function load_video {
+  if [ x$feature_all_video_module = xy ]; then
     insmod all_video
-else
+  else
     insmod efi_gop
     insmod efi_uga
+    insmod ieee1275_fb
     insmod vbe
     insmod vga
     insmod video_bochs
     insmod video_cirrus
-fi
+  fi
+}
 
+load_video
 if loadfont unicode; then
   set gfxmode=auto
-  if [ "${grub_platform}" = "efi" ]; then
-    terminal_output --append gfxterm
-  else
+  insmod gfxterm
   terminal_output gfxterm
-  fi
 fi
 
-if serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1; then
-  terminal_input --append serial
-  terminal_output --append serial
-fi
+background_image $prefix/logo.png
 
-insmod png
-background_image ${prefix}/logo.png
+set color_normal=white/black
+set menu_color_normal=light-cyan/black
+set menu_color_highlight=black/cyan
+
+if serial --unit=0 --speed=115200; then
+  terminal_input --append serial_com0
+  terminal_output --append serial_com0
+fi
 
 function set_gfxpayload {
   if [ ${vesa_mode} -eq 1 ]; then
@@ -58,7 +75,7 @@ function set_gfxpayload {
   fi
 }
 
-set RR_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait intremap=off net.ifnames=0 panic=5 split_lock_detect=off pcie_aspm=off intel_pstate=disable nox2apic nomodeset"
+set RR_CMDLINE="earlyprintk earlycon=uart8250,io,0x3f8,115200n8 console=ttyS0,115200n8 root=/dev/ram rootwait nointremap net.ifnames=0 panic=5 split_lock_detect=off pcie_aspm=off intel_pstate=disable nox2apic nomodeset"
 
 search --set=root --label "RR3"
 if [ -s /zImage-dsm -a -s /initrd-dsm ]; then