diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh index 3624bf1e..30a75e05 100755 --- a/files/initrd/opt/arc/arc-functions.sh +++ b/files/initrd/opt/arc/arc-functions.sh @@ -1209,7 +1209,7 @@ function sysinfo() { [ -d /sys/firmware/efi ] && BOOTSYS="UEFI" || BOOTSYS="Legacy" # Get System Informations CPU="$(echo $(cat /proc/cpuinfo 2>/dev/null | grep 'model name' | uniq | awk -F':' '{print $2}'))" - RAM="$(free -m 2>/dev/null | grep -i mem | awk '{print $2}') MB" + RAM="${RAMTOTAL} MB" VENDOR="$(dmesg 2>/dev/null | grep -i "DMI:" | sed 's/\[.*\] DMI: //i')" ETHX=$(ls /sys/class/net/ | grep eth) || true NIC="$(readConfigKey "device.nic" "${USER_CONFIG_FILE}")" @@ -1261,7 +1261,7 @@ function sysinfo() { for ETH in ${ETHX}; do IP="" STATICIP="$(readConfigKey "static.${ETH}" "${USER_CONFIG_FILE}")" - DRIVER=$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}') + DRIVER="$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')" MAC="$(readConfigKey "mac.${ETH}" "${USER_CONFIG_FILE}")" MACR="$(cat /sys/class/net/${ETH}/address | sed 's/://g')" COUNT=0 @@ -1439,7 +1439,7 @@ function fullsysinfo() { [ -d /sys/firmware/efi ] && BOOTSYS="UEFI" || BOOTSYS="Legacy" # Get System Informations CPU="$(echo $(cat /proc/cpuinfo 2>/dev/null | grep 'model name' | uniq | awk -F':' '{print $2}'))" - RAM="$(free -m 2>/dev/null | grep -i mem | awk '{print $2}') MB" + RAM="${RAMTOTAL} MB" VENDOR="$(dmesg 2>/dev/null | grep -i "DMI:" | sed 's/\[.*\] DMI: //i')" ETHX=$(ls /sys/class/net/ | grep -v lo || true) NIC="$(readConfigKey "device.nic" "${USER_CONFIG_FILE}")" @@ -1491,7 +1491,7 @@ function fullsysinfo() { for ETH in ${ETHX}; do IP="" STATICIP="$(readConfigKey "static.${ETH}" "${USER_CONFIG_FILE}")" - DRIVER=$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}') + DRIVER="$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')" MAC="$(cat /sys/class/net/${ETH}/address | sed 's/://g')" MACR="$(cat /sys/class/net/${ETH}/address | sed 's/://g')" COUNT=0 diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index 9ee686b9..f3701b2b 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -14,7 +14,8 @@ [ -z "${LOADER_DISK}" ] && die "Loader Disk not found!" # Memory: Check Memory installed -RAMTOTAL=$(free -m | grep -i mem | awk '{print$2}') +RAMFREE=$(($(free -m | grep -i mem | awk '{print$2}') / 1024 + 1)) +RAMTOTAL=$((${RAMFREE} * 1024)) [ -z "${RAMTOTAL}" ] || [ ${RAMTOTAL} -le 0 ] && RAMTOTAL=8192 RAMMAX=$((${RAMTOTAL} * 2)) RAMMIN=$((${RAMTOTAL} / 2)) diff --git a/files/initrd/opt/arc/boot.sh b/files/initrd/opt/arc/boot.sh index dac4158d..6074110c 100755 --- a/files/initrd/opt/arc/boot.sh +++ b/files/initrd/opt/arc/boot.sh @@ -53,7 +53,8 @@ PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")" LKM="$(readConfigKey "lkm" "${USER_CONFIG_FILE}")" MACSYS="$(readConfigKey "arc.macsys" "${USER_CONFIG_FILE}")" CPU="$(echo $(cat /proc/cpuinfo 2>/dev/null | grep 'model name' | uniq | awk -F':' '{print $2}'))" -RAM="$(free -m 2>/dev/null | grep -i mem | awk '{print $2}') MB" +RAMFREE=$(($(free -m | grep -i mem | awk '{print$2}') / 1024 + 1)) +RAM="$((${RAMFREE} * 1024)) MB" VENDOR="$(dmesg 2>/dev/null | grep -i "DMI:" | sed 's/\[.*\] DMI: //i')" echo -e " \033[1;37mDSM:\033[0m" @@ -185,7 +186,7 @@ elif [ "${DIRECTBOOT}" = "false" ]; then echo -e " \033[1;34mDetected ${NIC} NIC.\033[0m \033[1;37mWaiting for Connection:\033[0m" for ETH in ${ETHX}; do IP="" - DRIVER=$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}') + DRIVER="$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')" COUNT=0 while true; do IP="$(getIP ${ETH})" diff --git a/files/initrd/opt/arc/init.sh b/files/initrd/opt/arc/init.sh index 0a4dbb9a..59b309a3 100755 --- a/files/initrd/opt/arc/init.sh +++ b/files/initrd/opt/arc/init.sh @@ -152,7 +152,7 @@ echo -e "\033[1;34mDetected ${NIC} NIC.\033[0m \033[1;37mWaiting for Connection: for ETH in ${ETHX}; do IP="" STATICIP="$(readConfigKey "static.${ETH}" "${USER_CONFIG_FILE}")" - DRIVER=$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}') + DRIVER="$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')" COUNT=0 while true; do ARCIP="$(readConfigKey "ip.${ETH}" "${USER_CONFIG_FILE}")"