From b0405f503077d356c6fdb2ca5ddc0ab08fb20e3d Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Thu, 27 Jun 2024 19:05:46 +0200 Subject: [PATCH] tree: fix syntax Signed-off-by: AuxXxilium --- files/initrd/opt/arc/boot.sh | 2 +- files/initrd/opt/arc/include/network.sh | 6 +++--- files/initrd/opt/arc/init.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/files/initrd/opt/arc/boot.sh b/files/initrd/opt/arc/boot.sh index bd5a320c..2734958f 100755 --- a/files/initrd/opt/arc/boot.sh +++ b/files/initrd/opt/arc/boot.sh @@ -159,7 +159,7 @@ if [ "${ARCPATCH}" == "true" ]; then NICPORTS="$(readConfigKey "${MODEL}.ports" "${S_FILE}" 2>/dev/null)" [ -z "${NICPORTS}" ] && NICPORTS=1 else - NICPORTS=$(ls /sys/class/net/ 2>/dev/null | grep eth | wc -l) + NICPORTS="$(echo ${ETHX} | wc -w)" fi for ETH in ${ETHX}; do MAC="$(readConfigKey "arc.${ETH}" "${USER_CONFIG_FILE}")" diff --git a/files/initrd/opt/arc/include/network.sh b/files/initrd/opt/arc/include/network.sh index 3a08aa5c..1e8cbfcc 100755 --- a/files/initrd/opt/arc/include/network.sh +++ b/files/initrd/opt/arc/include/network.sh @@ -1,17 +1,17 @@ # Get Network Config for Loader function getnet() { - ETHX="$(ls /sys/class/net/ 2>/dev/null | grep eth)" # real network cards list + ETHX="$(ls /sys/class/net/ 2>/dev/null | grep eth)" MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")" ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")" NICPORTS="$(readConfigKey "${MODEL}.ports" "${S_FILE}" 2>/dev/null)" if [ "${ARCPATCH}" == "true" ]; then - ETHN="${#ETHX}" + ETHN="$(echo ${ETHX} | wc -w)" MACS=($(generateMacAddress "${MODEL}" ${ETHN} true)) for I in $(seq 1 ${ETHN}); do writeConfigKey "arc.eth$((${I} - 1))" "${MACS[$((${I} - 1))]}" "${USER_CONFIG_FILE}" done elif [ "${ARCPATCH}" == "false" ]; then - ETHN=$(ls /sys/class/net/ 2>/dev/null | grep eth | wc -l) + ETHN="$(echo ${ETHX} | wc -w)" MACS=($(generateMacAddress "${MODEL}" ${ETHN} false)) for I in $(seq 1 ${ETHN}); do writeConfigKey "arc.eth$((${I} - 1))" "${MACS[$((${I} - 1))]}" "${USER_CONFIG_FILE}" diff --git a/files/initrd/opt/arc/init.sh b/files/initrd/opt/arc/init.sh index e36ff92b..4058b80b 100755 --- a/files/initrd/opt/arc/init.sh +++ b/files/initrd/opt/arc/init.sh @@ -102,7 +102,7 @@ for ETH in ${ETHX}; do [ "${ETH::3}" = "eth" ] && ethtool -s ${ETH} wol g 2>/dev/null || true initConfigKey "arc.${ETH}" "${MACR}" "${USER_CONFIG_FILE}" done -ETHN="${#ETHX}" +ETHN="$(echo ${ETHX} | wc -w)" writeConfigKey "device.nic" "${ETHN}" "${USER_CONFIG_FILE}" # No network devices echo