diff --git a/objects.tar.gz b/objects.tar.gz index 07dc8b844..1818dcde4 100644 Binary files a/objects.tar.gz and b/objects.tar.gz differ diff --git a/sherpa-manager.tar.gz b/sherpa-manager.tar.gz index 992872195..747aba1b4 100644 Binary files a/sherpa-manager.tar.gz and b/sherpa-manager.tar.gz differ diff --git a/support/sherpa-manager.source b/support/sherpa-manager.source index 03e7ca3b8..6cb0b4719 100755 --- a/support/sherpa-manager.source +++ b/support/sherpa-manager.source @@ -764,9 +764,9 @@ DebugLogEnv() DebugKernel ok version "$(OsGetKernelVersion)" if OsIsStdKernelPageSize; then - DebugKernel ok 'page size' "${r_kernel_page_size}B" + DebugKernel ok 'page size' "$r_kernel_page_size" else - DebugKernel warning 'page size' "${r_kernel_page_size}B" + DebugKernel warning 'page size' "$r_kernel_page_size" fi DebugFirmware ok OS "$(OsGetQnapOS)" @@ -902,7 +902,7 @@ DebugLogEnv() DebugInfoMinSepr RunAndLog "/usr/sbin/screen -ls" "$r_screen_sessions_pathfile" '' 1 DebugInfoMinSepr - RunAndLog '/usr/bin/free -m' "$r_ram_freeused_pathfile" '' 1 + RunAndLog '/usr/bin/free' "$r_ram_freeused_pathfile" '' 1 DebugInfoMinSepr RunAndLog "/bin/grep -i 'out of memory\|oom-killer' /mnt/HDA_ROOT/.logs/kmsg" "$r_oom_log_pathfile" '' 1 DebugInfoMinSepr @@ -1046,7 +1046,7 @@ CheckEnv() if [[ ${installed_version//.} -gt 238 ]]; then ipks_downgrade=true - ShowAsNote "various IPKs will be downgraded to suit ${r_kernel_page_size}B kernel page size" + ShowAsNote "various IPKs will be downgraded to suit $r_kernel_page_size kernel page size" IPKs-ACdowngrade-to:Add "$target_packages" else IPKs-ACdowngrade-sk:Add "$target_packages" @@ -3050,7 +3050,7 @@ ShowArgSuggestions() fi fi - [[ -e $r_report_output_pathfile ]] && cat "$r_report_output_pathfile" + [[ -e $r_report_output_pathfile ]] && /bin/cat "$r_report_output_pathfile" DebugArray args_incomplete "${args_incomplete[*]:-}" DebugArray args_remaining "${args_remaining[*]:-}" @@ -8780,9 +8780,9 @@ OsGetKernelPageSize() { if [[ -e /sbin/hal_app ]]; then - /sbin/hal_app --get_pagesize + echo "$(/sbin/hal_app --get_pagesize)B" else - /bin/grep KernelPageSize /proc/1/smaps | head -n1 | cut -f2 -d':' | tr -d ' ' + /bin/grep KernelPageSize /proc/1/smaps | head -n1 | cut -f2 -d':' | tr -d ' ' | /bin/sed 's|kB|kiB|' fi } @@ -9250,7 +9250,7 @@ OsIsStdKernelPageSize() # Standard kernel page size for most QNAP NAS is 4kiB. Non-standard size is 32kiB (confirmed on the TS-431XeU, TS-431X3 & TS-1635). # https://www.qnap.com/en-us/how-to/faq/article/why-do-the-installed-third-party-containers-not-run-successfully-on-specific-32-bit-arm-devices - [[ ${r_kernel_page_size:=$(OsGetKernelPageSize)} = 4096 || $r_kernel_page_size = 4kB ]] + [[ ${r_kernel_page_size:=$(OsGetKernelPageSize)} = 4096B || $r_kernel_page_size = 4kiB ]] }