From 4193c5e867879aa73e6dd6fc88a9b788f9d1bdd1 Mon Sep 17 00:00:00 2001
From: AuxXxilium <info@auxxxilium.tech>
Date: Thu, 5 Sep 2024 16:46:21 +0200
Subject: [PATCH] tree: some fixes and debug

Signed-off-by: AuxXxilium <info@auxxxilium.tech>
---
 files/initrd/opt/arc/arc-functions.sh     | 2 +-
 files/initrd/opt/arc/arc.sh               | 2 +-
 files/initrd/opt/arc/boot.sh              | 1 +
 files/initrd/opt/arc/include/consts.sh    | 1 -
 files/initrd/opt/arc/include/functions.sh | 2 +-
 files/initrd/opt/arc/ramdisk-patch.sh     | 1 -
 6 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh
index dcf306dc..89ff030c 100755
--- a/files/initrd/opt/arc/arc-functions.sh
+++ b/files/initrd/opt/arc/arc-functions.sh
@@ -1219,7 +1219,7 @@ function sysinfo() {
   TEXT+="\n  CPU Scaling: \Zb${CPUFREQ}\Zn"
   TEXT+="\n  Secure Boot: \Zb${SECURE}\Zn"
   TEXT+="\n  Bootdisk: \Zb${LOADER_DISK}\Zn"
-  TEXT+="\n  Date/Time: \Zb$(date)\Zn"
+  TEXT+="\n  Time Online | Hardware: \Zb$(date) | $(hwclock)\Zn"
   TEXT+="\n"
   TEXT+="\n\Z4> Network: ${ETHN} NIC\Zn\n"
   for ETH in ${ETHX}; do
diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh
index 14fec1ce..87573dc4 100755
--- a/files/initrd/opt/arc/arc.sh
+++ b/files/initrd/opt/arc/arc.sh
@@ -525,7 +525,7 @@ function arcPatch() {
       dialog --clear --backtitle "$(backtitle)" \
         --nocancel --title "Arc Patch"\
         --menu "Please choose an Option." 7 50 0 \
-        1 "Use Arc Patch (QC, Push Notify and AME)" \
+        1 "Use Arc Patch (QC, Push Notify and more)" \
         2 "Use random SN/Mac" \
         3 "Use my own SN/Mac" \
       2>"${TMP_PATH}/resp"
diff --git a/files/initrd/opt/arc/boot.sh b/files/initrd/opt/arc/boot.sh
index 6cc46a57..698a1f6d 100755
--- a/files/initrd/opt/arc/boot.sh
+++ b/files/initrd/opt/arc/boot.sh
@@ -68,6 +68,7 @@ echo -e "\033[1;37mSystem:\033[0m"
 echo -e "Vendor: \033[1;37m${VENDOR}\033[0m"
 echo -e "CPU: \033[1;37m${CPU}\033[0m"
 echo -e "Memory: \033[1;37m${RAMTOTAL}GB\033[0m"
+echo -e "Boottime: \033[1;37m$(date) | $(hwclock)\033[0m"
 echo
 
 if ! readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q nvmesystem; then
diff --git a/files/initrd/opt/arc/include/consts.sh b/files/initrd/opt/arc/include/consts.sh
index 873fac3d..f636ceaa 100755
--- a/files/initrd/opt/arc/include/consts.sh
+++ b/files/initrd/opt/arc/include/consts.sh
@@ -37,7 +37,6 @@ S_FILE="${MODEL_CONFIG_PATH}/serials.yml"
 S_FILE_ARC="${MODEL_CONFIG_PATH}/arc_serials.yml"
 S_FILE_ENC="${MODEL_CONFIG_PATH}/arc_serials.enc"
 P_FILE="${MODEL_CONFIG_PATH}/platforms.yml"
-D_FILE="${MODEL_CONFIG_PATH}/data.yml"
 
 EXTRACTOR_PATH="${PART3_PATH}/extractor"
 EXTRACTOR_BIN="syno_extract_system_patch"
\ No newline at end of file
diff --git a/files/initrd/opt/arc/include/functions.sh b/files/initrd/opt/arc/include/functions.sh
index 0c4d64ea..0fa17f2a 100755
--- a/files/initrd/opt/arc/include/functions.sh
+++ b/files/initrd/opt/arc/include/functions.sh
@@ -547,7 +547,7 @@ function ntpCheck() {
     ln -fs /usr/share/zoneinfo/${REGION}/${TIMEZONE} /etc/localtime
     # NTP
     /etc/init.d/S49ntpd restart > /dev/null 2>&1
-    hwclock -w > /dev/null 2>&1
+    #hwclock --systohc > /dev/null 2>&1
   fi
   if [ -z "${LAYOUT}" ]; then
     [ -n "${KEYMAP}" ] && KEYMAP="$(echo ${KEYMAP} | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]' | tr -d '[:punct:]' | tr -d '[:digit:]')"
diff --git a/files/initrd/opt/arc/ramdisk-patch.sh b/files/initrd/opt/arc/ramdisk-patch.sh
index f607cfb7..06a94c5d 100755
--- a/files/initrd/opt/arc/ramdisk-patch.sh
+++ b/files/initrd/opt/arc/ramdisk-patch.sh
@@ -148,7 +148,6 @@ gzip -dc "${LKMS_PATH}/rp-${PLATFORM}-${KVERP}-${LKM}.ko.gz" >"${RAMDISK_PATH}/u
 
 # Addons
 echo "Create addons.sh" >"${LOG_FILE}"
-rm -rf "${RAMDISK_PATH}/addons" >/dev/null 2>&1 || true
 mkdir -p "${RAMDISK_PATH}/addons"
 echo "#!/bin/sh" >"${RAMDISK_PATH}/addons/addons.sh"
 echo 'echo "addons.sh called with params ${@}"' >>"${RAMDISK_PATH}/addons/addons.sh"