AuxXxilium/arc
1
0
Fork 0
mirror of https://github.com/AuxXxilium/arc.git synced 2024-11-23 23:59:53 +07:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

tree: fix more

Browse Source 
Signed-off-by: AuxXxilium <info@auxxxilium.tech>
This commit is contained in:
AuxXxilium 2024-09-08 12:44:42 +02:00
parent 51ffa84ffb
commit 9d3293f91a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
files/initrd/opt/arc/arc-functions.sh
View File

@ -1145,6 +1145,7 @@ function sysinfo() {
USERCMDLINEINFO="$(readConfigMap "cmdline" "${USER_CONFIG_FILE}")"
USERSYNOINFO="$(readConfigMap "synoinfo" "${USER_CONFIG_FILE}")"
fi
[ "${BUILDDONE}" == "true" ] && BUILDNUM="$(readConfigKey "buildnum" "${USER_CONFIG_FILE}")"
DIRECTBOOT="$(readConfigKey "directboot" "${USER_CONFIG_FILE}")"
LKM="$(readConfigKey "lkm" "${USER_CONFIG_FILE}")"
KERNELLOAD="$(readConfigKey "kernelload" "${USER_CONFIG_FILE}")"
@ -1183,7 +1184,7 @@ function sysinfo() {
TEXT+="\n Secure Boot: \Zb${SECURE}\Zn"
TEXT+="\n Bootdisk: \Zb${LOADER_DISK}\Zn"
[ -n "${REGION}" ] && [ -n "${TIMEZONE}" ] && TEXT+="\n Timezone: \Zb${REGION}/${TIMEZONE}\Zn"
TEXT+="\n Time OS: \Zb$(TZ="${REGION}/${TIMEZONE}" && date "+%F %H:%M:%S")\Zn"
TEXT+="\n Time: \Zb$(date "+%F %H:%M:%S")\Zn"
TEXT+="\n"
TEXT+="\n\Z4> Network: ${ETHN} NIC\Zn\n"
for ETH in ${ETHX}; do
@ -1225,7 +1226,7 @@ function sysinfo() {
TEXT+="\n Config | Build: \Zb${CONFDONE} | ${BUILDDONE}\Zn"
TEXT+="\n Config Version: \Zb${CONFIGVER}\Zn"
if [ "${CONFDONE}" == "true" ]; then
TEXT+="\n\Z4> DSM ${PRODUCTVER}: ${MODELID:-${MODEL}}\Zn"
TEXT+="\n\Z4> DSM ${PRODUCTVER} (${BUILDNUM}): ${MODELID:-${MODEL}}\Zn"
TEXT+="\n Kernel | LKM: \Zb${KVER} | ${LKM}\Zn"
TEXT+="\n Platform | DeviceTree: \Zb${PLATFORM} | ${DT}\Zn"
TEXT+="\n Arc Patch: \Zb${ARCPATCH}\Zn"

8
files/initrd/opt/arc/include/functions.sh
View File

@ -532,6 +532,8 @@ function ntpCheck() {
LAYOUT="$(readConfigKey "layout" "${USER_CONFIG_FILE}")"
KEYMAP="$(readConfigKey "keymap" "${USER_CONFIG_FILE}")"
if [ "${OFFLINE}" == "false" ]; then
# NTP
/etc/init.d/S49ntpd restart > /dev/null 2>&1
# Timezone
REGION="$(readConfigKey "time.region" "${USER_CONFIG_FILE}")"
TIMEZONE="$(readConfigKey "time.timezone" "${USER_CONFIG_FILE}")"
@ -549,10 +551,8 @@ function ntpCheck() {
writeConfigKey "time.timezone" "${TIMEZONE}" "${USER_CONFIG_FILE}"
fi
if [ -n "${REGION}" ] && [ -n "${TIMEZONE}" ]; then
ln -fs /usr/share/zoneinfo/${REGION}/${TIMEZONE} /etc/localtime
# NTP
/etc/init.d/S49ntpd restart > /dev/null 2>&1
#hwclock --systohc
ln -sf "/usr/share/zoneinfo/right/${REGION}/${TIMEZONE}" /etc/localtime
hwclock --systohc
fi
fi
if [ -z "${LAYOUT}" ]; then