diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh index a2182fcc..9fac3cc5 100755 --- a/files/initrd/opt/arc/arc-functions.sh +++ b/files/initrd/opt/arc/arc-functions.sh @@ -1210,7 +1210,7 @@ function sysinfo() { # Get System Informations CPU="$(echo $(cat /proc/cpuinfo 2>/dev/null | grep 'model name' | uniq | awk -F':' '{print $2}'))" VENDOR="$(dmesg 2>/dev/null | grep -i "DMI:" | sed 's/\[.*\] DMI: //i')" - ETHX=$(ls /sys/class/net/ | grep -v lo) || true + ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true NIC="$(readConfigKey "device.nic" "${USER_CONFIG_FILE}")" CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")" BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")" @@ -1439,7 +1439,7 @@ function fullsysinfo() { # Get System Informations CPU="$(echo $(cat /proc/cpuinfo 2>/dev/null | grep 'model name' | uniq | awk -F':' '{print $2}'))" VENDOR="$(dmesg 2>/dev/null | grep -i "DMI:" | sed 's/\[.*\] DMI: //i')" - ETHX=$(ls /sys/class/net/ | grep -v lo || true) + ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true NIC="$(readConfigKey "device.nic" "${USER_CONFIG_FILE}")" CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")" BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")" @@ -1676,7 +1676,7 @@ function fullsysinfo() { # Shows Networkdiag to user function networkdiag() { MSG="" - ETHX=$(ls /sys/class/net/ | grep -v lo) || true + ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true for ETH in ${ETHX}; do MSG+="Interface: ${ETH}\n" addr=$(getIP ${ETH}) @@ -1751,7 +1751,7 @@ function credits() { # allow setting Static IP for Loader function staticIPMenu() { # Get Amount of NIC - ETHX=$(ls /sys/class/net/ | grep -v lo) || true + ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true for ETH in ${ETHX}; do STATIC="$(readConfigKey "static.${ETH}" "${USER_CONFIG_FILE}")" DRIVER=$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}') diff --git a/files/initrd/opt/arc/boot.sh b/files/initrd/opt/arc/boot.sh index 98517ba7..b60b3ca5 100755 --- a/files/initrd/opt/arc/boot.sh +++ b/files/initrd/opt/arc/boot.sh @@ -82,7 +82,7 @@ KERNELLOAD="$(readConfigKey "arc.kernelload" "${USER_CONFIG_FILE}")" KERNELPANIC="$(readConfigKey "arc.kernelpanic" "${USER_CONFIG_FILE}")" DIRECTBOOT="$(readConfigKey "arc.directboot" "${USER_CONFIG_FILE}")" EMMCBOOT="$(readConfigKey "arc.emmcboot" "${USER_CONFIG_FILE}")" -ETHX=$(ls /sys/class/net/ | grep -v lo) || true +ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true declare -A CMDLINE diff --git a/files/initrd/opt/arc/include/network.sh b/files/initrd/opt/arc/include/network.sh index 35c2faab..d29b0800 100755 --- a/files/initrd/opt/arc/include/network.sh +++ b/files/initrd/opt/arc/include/network.sh @@ -1,6 +1,6 @@ # Get Network Config for Loader function getnet() { - ETHX=$(ls /sys/class/net/ | grep -v lo) || true + ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")" if [ "${ARCPATCH}" = "true" ]; then ARCMACNUM=1 @@ -52,7 +52,7 @@ function getnet() { } # Get Amount of NIC -ETHX=$(ls /sys/class/net/ | grep eth) || true +ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true # Get actual IP for ETH in ${ETHX}; do IPCON="$(readConfigKey "ip.${ETH}" "${USER_CONFIG_FILE}")" diff --git a/files/initrd/opt/arc/init.sh b/files/initrd/opt/arc/init.sh index 1a1ca11e..658d0c40 100755 --- a/files/initrd/opt/arc/init.sh +++ b/files/initrd/opt/arc/init.sh @@ -74,7 +74,7 @@ else fi # Init Network -ETHX=$(ls /sys/class/net/ | grep -v lo) || true +ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true MACSYS="$(readConfigKey "arc.macsys" "${USER_CONFIG_FILE}")" # Write Mac to config NIC=0 diff --git a/files/initrd/opt/arc/ramdisk-patch.sh b/files/initrd/opt/arc/ramdisk-patch.sh index 2d14f257..46c605a8 100755 --- a/files/initrd/opt/arc/ramdisk-patch.sh +++ b/files/initrd/opt/arc/ramdisk-patch.sh @@ -158,7 +158,7 @@ chmod +x "${RAMDISK_PATH}/addons/addons.sh" # Required addons: "revert" "misc" "eudev" "disks" "localrss" "wol" # This order cannot be changed. -for ADDON in "revert" "misc" "eudev" "disks" "localrss" "wol"; do +for ADDON in "revert" "misc" "eudev" "disks" "localrss" "notify" "wol"; do PARAMS="" if [ "${ADDON}" = "disks" ]; then PARAMS="${HDDSORT} ${USBMOUNT}" @@ -216,7 +216,7 @@ done # Network card configuration file IPV6="$(readConfigKey "arc.ipv6" "${USER_CONFIG_FILE}")" -ETHX=$(ls /sys/class/net/ | grep -v lo) || true +ETHX=$(ls /sys/class/net/ 2>/dev/null | grep eth) || true for ETH in ${ETHX}; do if [ "${IPV6}" = "true" ]; then echo -e "DEVICE=${ETH}\nBOOTPROTO=dhcp\nONBOOT=yes\nIPV6INIT=dhcp\nIPV6_ACCEPT_RA=1" >"${RAMDISK_PATH}/etc/sysconfig/network-scripts/ifcfg-${ETH}"