From e16be2497aae260d6d4de03272ad2937684c4887 Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Sun, 10 Mar 2024 17:21:09 +0800
Subject: [PATCH] fix WORK_PATH

---
 files/initrd/opt/rr/boot.sh               |  4 +++-
 files/initrd/opt/rr/init.sh               |  2 +-
 files/initrd/opt/rr/vmlinux-to-bzImage.sh | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/files/initrd/opt/rr/boot.sh b/files/initrd/opt/rr/boot.sh
index 521652fc..c641dbed 100755
--- a/files/initrd/opt/rr/boot.sh
+++ b/files/initrd/opt/rr/boot.sh
@@ -123,7 +123,9 @@ else
   CMDLINE['noefi']=""
 fi
 if [ ! "${BUS}" = "usb" ]; then
-  SIZE=$(($(cat /sys/block/${LOADER_DISK/\/dev\//}/size) / 2048 + 10))
+  SZ=$(blockdev --getsz ${LOADER_DISK} 2>/dev/null)  # SZ=$(cat /sys/block/${LOADER_DISK/\/dev\//}/size)
+  SS=$(blockdev --getss ${LOADER_DISK} 2>/dev/null)  # SS=$(cat /sys/block/${LOADER_DISK/\/dev\//}/queue/hw_sector_size)
+  SIZE=$((${SZ} * ${SS} / 1024 / 1024 + 10))
   # Read SATADoM type
   DOM="$(readModelKey "${MODEL}" "dom")"
   CMDLINE['synoboot_satadom']="${DOM}"
diff --git a/files/initrd/opt/rr/init.sh b/files/initrd/opt/rr/init.sh
index c4475969..b5365808 100755
--- a/files/initrd/opt/rr/init.sh
+++ b/files/initrd/opt/rr/init.sh
@@ -117,7 +117,7 @@ fi
 
 # If is to boot automatically, do it
 if [ ${BOOT} -eq 1 ]; then
-  boot.sh && exit 0
+  ${WORK_PATH}/boot.sh && exit 0
 fi
 
 # Wait for an IP
diff --git a/files/initrd/opt/rr/vmlinux-to-bzImage.sh b/files/initrd/opt/rr/vmlinux-to-bzImage.sh
index cbf78e4d..2e580b9e 100755
--- a/files/initrd/opt/rr/vmlinux-to-bzImage.sh
+++ b/files/initrd/opt/rr/vmlinux-to-bzImage.sh
@@ -40,7 +40,7 @@ size_le() {
     }
   )
 }
-SCRIPT_DIR=$(dirname $0)
+
 VMLINUX_MOD=${1}
 ZIMAGE_MOD=${2}
 KVER_MAJOR=${KVER:0:1}
@@ -60,23 +60,23 @@ if [ ${KVER_MAJOR} -eq 4 ] || [ ${KVER_MAJOR} -eq 3 ]; then
   #  unknown             114460
   #)                     114570
   #crc32                 4
-  gzip -dc "${SCRIPT_DIR}/bzImage-template-v4.gz" >"${ZIMAGE_MOD}"
+  gzip -dc "${WORK_PATH}/bzImage-template-v4.gz" >"${ZIMAGE_MOD}"
 
   dd if="${VMLINUX_MOD}" of="${ZIMAGE_MOD}" bs=16494 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
   file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=15745134 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
   file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=15745244 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
 
-  RUN_SIZE=$(objdump -h ${VMLINUX_MOD} | sh "${SCRIPT_DIR}/calc_run_size.sh")
+  RUN_SIZE=$(objdump -h ${VMLINUX_MOD} | sh "${WORK_PATH}/calc_run_size.sh")
   size_le ${RUN_SIZE} | dd of=${ZIMAGE_MOD} bs=15745210 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
   size_le $(($((16#$(crc32 "${ZIMAGE_MOD}" | awk '{print $1}'))) ^ 0xFFFFFFFF)) | dd of="${ZIMAGE_MOD}" conv=notrunc oflag=append >"${LOG_FILE}" 2>&1 || dieLog
 else
   # Kernel version 5.x
-  gzip -dc "${SCRIPT_DIR}/bzImage-template-v5.gz" >"${ZIMAGE_MOD}"
+  gzip -dc "${WORK_PATH}/bzImage-template-v5.gz" >"${ZIMAGE_MOD}"
 
   dd if="${VMLINUX_MOD}" of="${ZIMAGE_MOD}" bs=14561 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
   file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=34463421 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
   file_size_le "${VMLINUX_MOD}" | dd of="${ZIMAGE_MOD}" bs=34479132 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
-  #  RUN_SIZE=`objdump -h ${VMLINUX_MOD} | sh "${SCRIPT_DIR}/calc_run_size.sh"`
+  #  RUN_SIZE=`objdump -h ${VMLINUX_MOD} | sh "${WORK_PATH}/calc_run_size.sh"`
   #  size_le ${RUN_SIZE} | dd of=${ZIMAGE_MOD} bs=34626904 seek=1 conv=notrunc >"${LOG_FILE}" 2>&1 || dieLog
   size_le $(($((16#$(crc32 "${ZIMAGE_MOD}" | awk '{print $1}'))) ^ 0xFFFFFFFF)) | dd of="${ZIMAGE_MOD}" conv=notrunc oflag=append >"${LOG_FILE}" 2>&1 || dieLog
 fi