.github/workflows/data.yml

@@ -65,7 +65,7 @@ jobs:
           sudo losetup -P "${LOOPX}" "rr/rr.img"
           rm -rf "/tmp/mnt/p3"
           mkdir -p "/tmp/mnt/p3"
-          sudo mount "${LOOPX}p3" "/tmp/mnt/p3"
+          mount "${LOOPX}p3" "/tmp/mnt/p3"
           unpackInitrd /tmp/mnt/p3/initrd-rr "rr/initrd"
 
           sudo apt update

.github/workflows/issues.yml

@@ -193,14 +193,13 @@ jobs:
 
           echo "Building..."
           {
-            echo ". menu.sh"
             [ -n "${{ env.language }}" ] && echo "echo \"${{ env.language }}.UTF-8\" >/mnt/p1/.locale"
             [ -n "${{ env.tips }}" ] && echo "echo -e \"${{ env.tips }}\" >/mnt/p3/AddTips"
-            [ -n "${{ env.kernel }}" ] && echo "writeConfigKey \"kernel\" \"${{ env.kernel }}\" \"\${USER_CONFIG_FILE}\""
+            [ -n "${{ env.kernel }}" ] && echo "menu.sh writeConfigKey \"kernel\" \"${{ env.kernel }}\" \"\${USER_CONFIG_FILE}\""
             echo "menu.sh modelMenu \"${{ env.model }}\""
             echo "menu.sh productversMenu \"${{ env.version }}\""
             [ -n "${{ env.addons }}" ] && { 
-              echo "writeConfigKey \"addons\" \"{}\" \"\${USER_CONFIG_FILE}\""
+              echo "menu.sh writeConfigKey \"addons\" \"{}\" \"\${USER_CONFIG_FILE}\""
               IFS=',' read -ra ADDON_ARR <<< "${{ env.addons }}"
               for A in "${ADDON_ARR[@]}"; do
                 if echo "${A}" | grep -qE '^[^:]+:[^:]+$'; then
@@ -210,25 +209,25 @@ jobs:
                   KEY="${A}"
                   VAL=""
                 fi
-                echo "writeConfigKey \"addons.\\\"${KEY}\\\"\" \"${VAL}\" \"\${USER_CONFIG_FILE}\""
+                echo "menu.sh writeConfigKey \"addons.\\\"${KEY}\\\"\" \"${VAL}\" \"\${USER_CONFIG_FILE}\""
               done
             }
             [ ! "custom" = "${{ env.kernel }}" ] && [ -n "${{ env.modules }}" ] && {
-              echo "writeConfigKey \"modules\" \"{}\" \"\${USER_CONFIG_FILE}\""
-              echo "mergeConfigModules \"$(echo "${{ env.modules }}" | tr ',' '\n')\" \"\${USER_CONFIG_FILE}\""
+              echo "menu.sh writeConfigKey \"modules\" \"{}\" \"\${USER_CONFIG_FILE}\""
+              echo "menu.sh mergeConfigModules \"$(echo "${{ env.modules }}" | sed 's/,/\\n/g')\" \"\${USER_CONFIG_FILE}\""
             }
             echo "menu.sh make"
             echo "menu.sh cleanCache"
-            [ -n "${{ env.sn }}" ] && echo "writeConfigKey \"sn\" \"${{ env.sn }}\" \"\${USER_CONFIG_FILE}\""
+            [ -n "${{ env.sn }}" ] && echo "menu.sh writeConfigKey \"sn\" \"${{ env.sn }}\" \"\${USER_CONFIG_FILE}\""
             [ -n "${{ env.macs }}" ] && {
               MACS=($(echo "${{ env.macs }}" | sed 's/[:-]//g' | sed 's/.*/\U&/' | sed 's/[;,]/ /g'))
-              [ -n "${MACS[0]}" ] && echo "writeConfigKey \"mac1\" \"${MACS[0]}\" \"\${USER_CONFIG_FILE}\""
-              [ -n "${MACS[1]}" ] && echo "writeConfigKey \"mac2\" \"${MACS[1]}\" \"\${USER_CONFIG_FILE}\""
+              [ -n "${MACS[0]}" ] && echo "menu.sh writeConfigKey \"mac1\" \"${MACS[0]}\" \"\${USER_CONFIG_FILE}\""
+              [ -n "${MACS[1]}" ] && echo "menu.sh writeConfigKey \"mac2\" \"${MACS[1]}\" \"\${USER_CONFIG_FILE}\""
             }
             [ "true" = "${{ env.template }}" ] && {
-              echo "writeConfigKey \"sn\" \"\" \"\${USER_CONFIG_FILE}\""
-              echo "writeConfigKey \"mac1\" \"\" \"\${USER_CONFIG_FILE}\""
-              echo "writeConfigKey \"mac2\" \"\" \"\${USER_CONFIG_FILE}\""
+              echo "menu.sh writeConfigKey \"sn\" \"\" \"\${USER_CONFIG_FILE}\""
+              echo "menu.sh writeConfigKey \"mac1\" \"\" \"\${USER_CONFIG_FILE}\""
+              echo "menu.sh writeConfigKey \"mac2\" \"\" \"\${USER_CONFIG_FILE}\""
             }
           } > build.sh
           chmod +x build.sh

VERSION

@@ -1 +1 @@
-25.9.6
+25.9.5

files/initrd/opt/rr/boot.sh

@@ -110,10 +110,16 @@ printf "%s \033[1;36m%s\033[0m\n" "$(TEXT "DMI:     ")" "${DMI}"
 printf "%s \033[1;36m%s\033[0m\n" "$(TEXT "CPU:     ")" "${CPU}"
 printf "%s \033[1;36m%s\033[0m\n" "$(TEXT "MEM:     ")" "${MEM}"
 
-if readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q nvmesystem; then
-  [ -z "$(ls /dev/nvme* | grep -vE "${LOADER_DISK}[0-9]?$" 2>/dev/null)" ] && printf "\033[1;33m*** %s ***\033[0m\n" "$(TEXT "Notice: Please insert at least one m.2 disk for system installation.")"
-else
-	[ -z "$(ls /dev/sd* | grep -vE "${LOADER_DISK}[0-9]?$" 2>/dev/null)" ] && printf "\033[1;33m*** %s ***\033[0m\n" "$(TEXT "Notice: Please insert at least one sata disk for system installation.")"
+if ! readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q nvmesystem; then
+  HASATA=0
+  for D in $(lsblk -dpno KNAME); do
+    [ "${D}" = "${LOADER_DISK}" ] && continue
+    if echo "sata sas scsi" | grep -wq "$(getBus "${D}")"; then
+      HASATA=1
+      break
+    fi
+  done
+  [ ${HASATA} = "0" ] && printf "\033[1;33m*** %s ***\033[0m\n" "$(TEXT "Notice: Please insert at least one sata/scsi disk for system installation (except for the bootloader disk).")"
 fi
 
 if checkBIOS_VT_d && [ "$(echo "${KVER:-4}" | cut -d'.' -f1)" -lt 5 ]; then

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

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

files/initrd/opt/rr/menu.sh

@@ -4067,9 +4067,8 @@ function notepadMenu() {
 
 ###############################################################################
 ###############################################################################
-if [ ! "$(basename -- "${0}")" = "$(basename -- "${BASH_SOURCE[0]}")" ] && [ $# -gt 0 ]; then
+if [ $# -ge 1 ]; then
   "$@"
-	cleanup_lock
 else
   if [ -z "${MODEL}" ] && [ -z "${PRODUCTVER}" ] && [ -n "$(findDSMRoot)" ]; then
     DIALOG --title "$(TEXT "Main menu")" \

files/mnt/p1/RR_VERSION

@@ -1 +1 @@
-25.9.6
+25.9.5