diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh index f15886ec..428bcf41 100755 --- a/files/initrd/opt/arc/arc-functions.sh +++ b/files/initrd/opt/arc/arc-functions.sh @@ -1169,7 +1169,7 @@ function sysinfo() { TEXT+="\Zb ${NAME}\Zn\n Disks: ${PORTNUM}\n" NUMPORTS=$((${NUMPORTS} + ${PORTNUM})) done - [ $(ls -l /sys/block/mmc* | wc -l) -gt 0 ] && TEXT+="\n MMC Controller:\n" + [ $(ls -l /sys/block/mmc* 2>/dev/null | wc -l) -gt 0 ] && TEXT+="\n MMC Controller:\n" for PCI in $(lspci -d ::805 2>/dev/null | awk '{print $1}'); do NAME=$(lspci -s "${PCI}" 2>/dev/null | sed "s/\ .*://") PORTNUM=$(ls -l /sys/block/mmc* 2>/dev/null | grep "${PCI}" | wc -l) diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index 46fb911d..9e52b109 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -413,7 +413,6 @@ function arcPatch() { PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")" MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")" ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")" - ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")" # Check for Custom Build if [ "${ARCMODE}" = "automated" ] && [ "${ARCPATCH}" != "user" ]; then ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}")" @@ -484,7 +483,7 @@ function arcSettings() { dialog --backtitle "$(backtitlep)" --colors --title "Network Config" \ --infobox "Generating Network Config..." 3 40 sleep 2 - if [ "${ARCMODE}" != "automated" ] && [ "${ARCPATCH}" != "user" ]; then + if [ "${ARCPATCH}" != "user" ]; then getnet fi [ $? -ne 0 ] && return 1 diff --git a/files/initrd/opt/arc/boot.sh b/files/initrd/opt/arc/boot.sh index c3379d9c..f91000e1 100755 --- a/files/initrd/opt/arc/boot.sh +++ b/files/initrd/opt/arc/boot.sh @@ -200,8 +200,8 @@ ETHN=$(echo ${ETHX} | wc -w) [ -z "${ETHM}" ] && ETHM="${ETHN}" NIC=0 for N in ${ETHX}; do - MAC="$(readConfigKey "${N}" "${USER_CONFIG_FILE}" | tr '[:lower:]' '[:upper:]')" - [ -z "${MAC}" ] && MAC="$(cat /sys/class/net/${N}/address 2>/dev/null | tr '[:lower:]' '[:upper:]')" || NIC=$((NIC + 1)) + MAC="$(readConfigKey "${N}" "${USER_CONFIG_FILE}")" + [ -z "${MAC}" ] && MAC="$(cat /sys/class/net/${N}/address 2>/dev/null | tr '[:upper:]' '[:lower:]')" || NIC=$((NIC + 1)) [ ${NIC} -le ${ETHM} ] && CMDLINE["mac${NIC}"]="${MAC}" [ ${NIC} -ge ${ETHM} ] && break done