files/initrd/opt/rr/boot.sh

@@ -250,7 +250,6 @@ if [ "${DIRECT}" = "true" ]; then
   grub-editenv ${USER_GRUBENVFILE} set next_entry="direct"
 
   _bootwait || exit 0
-
   echo -e "\033[1;33m$(TEXT "Reboot to boot directly in DSM")\033[0m"
   reboot
   exit 0
@@ -344,7 +343,7 @@ else
     echo -e "\033[1;33m$(TEXT "Warning, running kexec with --noefi param, strange things will happen!!")\033[0m"
     KEXECARGS+=" --noefi"
   fi
-  kexec ${KEXECARGS} -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE} kexecboot" >"${LOG_FILE}" 2>&1 || dieLog
+  kexec ${KEXECARGS} -l "${MOD_ZIMAGE_FILE}" --initrd "${MOD_RDGZ_FILE}" --command-line="${CMDLINE_LINE}" >"${LOG_FILE}" 2>&1 || dieLog
 
   echo -e "\033[1;37m$(TEXT "Booting ...")\033[0m"
   # show warning message

files/initrd/opt/rr/menu.sh

@@ -2128,9 +2128,9 @@ function tryRecoveryDSM() {
     if [ -n "${R_PLATFORM}" ] && arrayExistItem "${R_PLATFORM}" ${PS} &&
       [ -n "${R_PRODUCTVER}" ] && arrayExistItem "${R_PRODUCTVER}" ${VS} &&
       [ -n "${R_BUILDNUM}" ] && [ -n "${R_SMALLNUM}" ]; then
-      cp -rf "${TMP_PATH}/mdX/usr/rr/backup/p1/"* "${PART1_PATH}"
+      cp -Rf "${TMP_PATH}/mdX/usr/rr/backup/p1/"* "${PART1_PATH}"
       if [ -d "${TMP_PATH}/mdX/usr/rr/backup/p3" ]; then
-        cp -rf "${TMP_PATH}/mdX/usr/rr/backup/p3/"* "${PART3_PATH}"
+        cp -Rf "${TMP_PATH}/mdX/usr/rr/backup/p3/"* "${PART3_PATH}"
       fi
       copyDSMFiles "${TMP_PATH}/mdX/.syno/patch"
       __umountDSMRootDisk
@@ -2439,7 +2439,7 @@ function savemodrr() {
     xz -dc <"${RR_RAMDISK_FILE}" | cpio -idm
   ) >/dev/null 2>&1 || true
   rm -rf "${RDXZ_PATH}/opt/rr"
-  cp -rf "$(dirname ${WORK_PATH})" "${RDXZ_PATH}/"
+  cp -Rf "$(dirname ${WORK_PATH})" "${RDXZ_PATH}/"
   (
     cd "${RDXZ_PATH}"
     RDSIZE=$(du -sb ${RDXZ_PATH} 2>/dev/null | awk '{print $1}')
@@ -3297,7 +3297,7 @@ function updateRR() {
     if [ "${KEY: -1}" = "/" ]; then
       rm -Rf "${VALUE}"/*
       mkdir -p "${VALUE}"
-      cp -rf "${TMP_PATH}/update/${VALUE}"/* "${VALUE}"
+      cp -Rf "${TMP_PATH}/update/${VALUE}"/* "${VALUE}"
       if [ "$(realpath "${VALUE}")" = "$(realpath "${MODULES_PATH}")" ]; then
         if [ -n "${MODEL}" -a -n "${PRODUCTVER}" ]; then
           KVER="$(readConfigKey "platforms.${PLATFORM}.productvers.\"${PRODUCTVER}\".kver" "${WORK_PATH}/platforms.yml")"
@@ -3379,7 +3379,7 @@ function updateAddons() {
   fi
 
   rm -Rf "${ADDONS_PATH}/"*
-  cp -rf "${TMP_PATH}/update/"* "${ADDONS_PATH}/"
+  cp -Rf "${TMP_PATH}/update/"* "${ADDONS_PATH}/"
   rm -rf "${TMP_PATH}/update"
   touch ${PART1_PATH}/.build
   sync

scripts/func.sh

@@ -248,7 +248,7 @@ function repackInitrd() {
     cd "${RDXZ_PATH}"
     sudo xz -dc <"${INITRD_FILE}" | sudo cpio -idm
   ) || true
-  sudo cp -rf "${PLUGIN_PATH}/"* "${RDXZ_PATH}/"
+  sudo cp -Rf "${PLUGIN_PATH}/"* "${RDXZ_PATH}/"
   [ -f "${OUTPUT_PATH}" ] && rm -rf "${OUTPUT_PATH}"
   (
     cd "${RDXZ_PATH}"