add "Edit modules that need to be copied to DSM"

files/initrd/opt/rr/menu.sh

@@ -630,6 +630,7 @@ function moduleMenu() {
       l "$(TEXT "Select loaded modules")" \
       u "$(TEXT "Upload a external module")" \
       p "$(TEXT "Priority use of official drivers:") \Z4${ODP}\Zn" \
+      f "$(TEXT "Edit modules that need to be copied to DSM")" \
       e "$(TEXT "Exit")" \
       2>${TMP_PATH}/resp
     [ $? -ne 0 ] && break
@@ -744,6 +745,22 @@ function moduleMenu() {
       [ "${ODP}" = "false" ] && ODP='true' || ODP='false'
       writeConfigKey "odp" "${ODP}" "${USER_CONFIG_FILE}"
       ;;
+    f)
+      if [ -f ${USER_UP_PATH}/modulelist ]; then
+        cp -f "${USER_UP_PATH}/modulelist" "${TMP_PATH}/modulelist.tmp"
+      else
+        cp -f "${WORK_PATH}/patch/modulelist" "${TMP_PATH}/modulelist.tmp"
+      fi
+      while true; do
+        DIALOG --title "$(TEXT "Edit with caution")" \
+          --editbox "${TMP_PATH}/modulelist.tmp" 0 0 2>"${TMP_PATH}/modulelist.user"
+        [ $? -ne 0 ] && return
+        [ ! -d "${USER_UP_PATH}" ] && mkdir -p "${USER_UP_PATH}"
+        mv -f "${TMP_PATH}/modulelist.user" "${USER_UP_PATH}/modulelist"
+        dos2unix "${USER_UP_PATH}/modulelist"
+        break
+      done
+      ;;
     e)
       break
       ;;
@@ -2012,6 +2029,7 @@ function editUserConfig() {
       --editbox "${USER_CONFIG_FILE}" 0 0 2>"${TMP_PATH}/userconfig"
     [ $? -ne 0 ] && return
     mv -f "${TMP_PATH}/userconfig" "${USER_CONFIG_FILE}"
+    dos2unix "${USER_CONFIG_FILE}"
     ERRORS=$(yq eval "${USER_CONFIG_FILE}" 2>&1)
     [ $? -eq 0 ] && break
     DIALOG --title "$(TEXT "Edit with caution")" \
@@ -2041,6 +2059,7 @@ function editGrubCfg() {
       --editbox "${GRUB_PATH}/grub.cfg" 0 0 2>"${TMP_PATH}/usergrub.cfg"
     [ $? -ne 0 ] && return
     mv -f "${TMP_PATH}/usergrub.cfg" "${GRUB_PATH}/grub.cfg"
+    dos2unix "${GRUB_PATH}/grub.cfg"
     break
   done
 }
@@ -2404,6 +2423,7 @@ function notepadMenu() {
     --editbox "${USER_UP_PATH}/notepad" 0 0 2>"${TMP_PATH}/notepad"
   [ $? -ne 0 ] && return
   mv -f "${TMP_PATH}/notepad" "${USER_UP_PATH}/notepad"
+  dos2unix "${USER_UP_PATH}/notepad"
 }
 
 ###############################################################################

files/initrd/opt/rr/patch/modulelist

@@ -0,0 +1,41 @@
+# `#: comment
+# $1: operation
+#     N: copy module to ramdisk, do not overwrite an existing file
+#     F: copy module to ramdisk, overwrite an existing file
+# $2: module file name (not module name)
+#
+# eg: N i915.ko
+
+# kvm
+N irqbypass.ko
+N kvm-intel.ko
+N kvm-amd.ko
+N kvm.ko
+
+# iwlwifi
+N libarc4.ko
+N cfg80211.ko
+N mac80211.ko
+N iwlwifi.ko
+N iwlmvm.ko
+N iwldvm.ko
+
+## i915
+#N i2c-algo-bit.ko
+#N dmabuf.ko
+#N i915-compat.ko
+#N drm_mipi_dsi.ko
+#N intel-gtt.ko
+#N drm_panel_orientation_quirks.ko
+#N hdmi.ko
+#N drm.ko
+#N drm_kms_helper.ko
+#N i915.ko
+## mei
+#N mei.ko
+#N mei-me.ko
+#N mei-gsc.ko
+#N mei-txe.ko
+#N mei_hdcp.ko
+#N mei_iaf.ko
+#N mei_pxp.ko

files/initrd/opt/rr/ramdisk-patch.sh

@@ -49,7 +49,7 @@ if [ -n "${PRODUCTVER}" -a -n "${BUILDNUM}" -a -n "${SMALLNUM}" ] &&
   echo -n "Patching Ramdisk."
   PATURL=""
   PATSUM=""
-fi
+  fi
 # Update new buildnumber
 PRODUCTVER=${majorversion}.${minorversion}
 BUILDNUM=${buildnumber}
@@ -197,6 +197,12 @@ echo "inetd" >>"${RAMDISK_PATH}/addons/addons.sh"
 
 # Build modules dependencies
 ${WORK_PATH}/depmod -a -b ${RAMDISK_PATH} 2>/dev/null
+# Copying modulelist
+if [ -f "${USER_UP_PATH}/modulelist" ]; then
+  cp -f "${USER_UP_PATH}/modulelist" "${RAMDISK_PATH}/addons/modulelist"
+else
+  cp -f "${WORK_PATH}/patch/modulelist" "${RAMDISK_PATH}/addons/modulelist"
+fi
 
 # Network card configuration file
 for N in $(seq 0 7); do