mgetadmin/arc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init/boot/arc-functions: fix

Browse Source 
Signed-off-by: AuxXxilium <info@auxxxilium.tech>
This commit is contained in:
AuxXxilium
2024-05-02 20:18:04 +02:00
parent 0235c8d817
commit 9b7d53c9a1
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1104,6 +1104,7 @@ function sysinfo() {
IP=""
STATICIP="$(readConfigKey "static.${ETH}" "${USER_CONFIG_FILE}")"
DRIVER="$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')"
NETBUS="$(ethtool -i ${ETH} 2>/dev/null | grep bus-info | cut -d' ' -f2)"
MAC="$(readConfigKey "mac.${ETH}" "${USER_CONFIG_FILE}")"
MACR="$(cat /sys/class/net/${ETH}/address | sed 's/://g')"
COUNT=0
@@ -1117,16 +1118,16 @@ function sysinfo() {
fi
if [ -n "${IP}" ]; then
SPEED=$(ethtool ${ETH} 2>/dev/null | grep "Speed:" | awk '{print $2}')
TEXT+="\n ${DRIVER} (${SPEED} | ${MSG}) \ZbIP: ${IP} | Mac: ${MACR} (${MAC})\Zn"
TEXT+="\n ${DRIVER} (${SPEED} | ${MSG}) \ZbIP: ${IP} | Mac: ${MACR} (${MAC}) @ ${NETBUS}\Zn"
break
fi
if [ ${COUNT} -gt 3 ]; then
TEXT+="\n ${DRIVER} \ZbIP: TIMEOUT | MAC: ${MACR} (${MAC})\Zn"
TEXT+="\n ${DRIVER} \ZbIP: TIMEOUT | MAC: ${MACR} (${MAC}) @ ${NETBUS}\Zn"
break
fi
sleep 3
if ethtool ${ETH} 2>/dev/null | grep 'Link detected' | grep -q 'no'; then
TEXT+="\n ${DRIVER} \ZbIP: NOT CONNECTED | MAC: ${MACR} (${MAC})\Zn"
TEXT+="\n ${DRIVER} \ZbIP: NOT CONNECTED | MAC: ${MACR} (${MAC}) @ ${NETBUS}\Zn"
break
fi
COUNT=$((${COUNT} + 3))
@@ -1332,6 +1333,7 @@ function fullsysinfo() {
IP=""
STATICIP="$(readConfigKey "static.${ETH}" "${USER_CONFIG_FILE}")"
DRIVER="$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')"
NETBUS="$(ethtool -i ${ETH} 2>/dev/null | grep bus-info | cut -d' ' -f2)"
MAC="$(readConfigKey "mac.${ETH}" "${USER_CONFIG_FILE}")"
MACR="$(cat /sys/class/net/${ETH}/address | sed 's/://g')"
COUNT=0
@@ -1345,16 +1347,16 @@ function fullsysinfo() {
fi
if [ -n "${IP}" ]; then
SPEED=$(ethtool ${ETH} 2>/dev/null | grep "Speed:" | awk '{print $2}')
TEXT+="\n${DRIVER} (${SPEED} | ${MSG}) IP: ${IP} | Mac: ${MACR} (${MAC})"
TEXT+="\n${DRIVER} (${SPEED} | ${MSG}) IP: ${IP} | Mac: ${MACR} (${MAC}) @ ${NETBUS}"
break
fi
if [ ${COUNT} -gt 3 ]; then
TEXT+="\n${DRIVER} IP: TIMEOUT | MAC: ${MACR} (${MAC})"
TEXT+="\n${DRIVER} IP: TIMEOUT | MAC: ${MACR} (${MAC}) @ ${NETBUS}"
break
fi
sleep 3
if ethtool ${ETH} 2>/dev/null | grep 'Link detected' | grep -q 'no'; then
TEXT+="\n${DRIVER} IP: NOT CONNECTED | MAC: ${MACR} (${MAC})"
TEXT+="\n${DRIVER} IP: NOT CONNECTED | MAC: ${MACR} (${MAC}) @ ${NETBUS}"
break
fi
COUNT=$((${COUNT} + 3))

11
files/initrd/opt/arc/boot.sh
View File

@@ -198,29 +198,28 @@ elif [ "${DIRECTBOOT}" = "false" ]; then
for ETH in ${ETHX}; do
IP=""
DRIVER="$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')"
BUS="$(ethtool -i ${ETH} 2>/dev/null | grep bus-info | cut -d' ' -f2)"
COUNT=0
while true; do
IP="$(getIP ${ETH})"
MSG="DHCP"
if [ -n "${IP}" ]; then
SPEED="$(ethtool -i ${ETH} 2>/dev/null | grep Speed: | cut -d' ' -f2)"
SPEED="$(ethtool ${ETH} 2>/dev/null | grep "Speed:" | awk '{print $2}')"
if [[ "${IP}" =~ ^169\.254\..* ]]; then
echo -e "\r\033[1;37m${DRIVER}@${BUS} (${SPEED} | ${MSG}):\033[0m LINK LOCAL (No DHCP server detected.)"
echo -e "\r\033[1;37m${DRIVER} (${SPEED} | ${MSG}):\033[0m LINK LOCAL (No DHCP server detected.)"
else
echo -e "\r\033[1;37m${DRIVER}@${BUS} (${SPEED} | ${MSG}):\033[0m Access \033[1;34mhttp://${IP}:5000\033[0m to connect to DSM via web."
echo -e "\r\033[1;37m${DRIVER} (${SPEED} | ${MSG}):\033[0m Access \033[1;34mhttp://${IP}:5000\033[0m to connect to DSM via web."
fi
ethtool -s ${ETH} wol g 2>/dev/null
[ ! -n "${IPCON}" ] && IPCON="${IP}"
break
fi
if [ ${COUNT} -gt ${BOOTIPWAIT} ]; then
echo -e "\r\033[1;37m${DRIVER}@${BUS}:\033[0m TIMEOUT"
echo -e "\r\033[1;37m${DRIVER}:\033[0m TIMEOUT"
break
fi
sleep 3
if ethtool ${ETH} 2>/dev/null | grep 'Link detected' | grep -q 'no'; then
echo -e "\r\033[1;37m${DRIVER}@${BUS}:\033[0m NOT CONNECTED"
echo -e "\r\033[1;37m${DRIVER}:\033[0m NOT CONNECTED"
break
fi
COUNT=$((${COUNT} + 3))

11
files/initrd/opt/arc/init.sh
View File

@@ -166,7 +166,6 @@ 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}')"
BUS="$(ethtool -i ${ETH} 2>/dev/null | grep bus-info | cut -d' ' -f2)"
COUNT=0
while true; do
ARCIP="$(readConfigKey "ip.${ETH}" "${USER_CONFIG_FILE}")"
@@ -183,24 +182,24 @@ for ETH in ${ETHX}; do
MSG="DHCP"
fi
if [ -n "${IP}" ]; then
SPEED="$(ethtool -i ${ETH} 2>/dev/null | grep Speed: | cut -d' ' -f2)"
SPEED="$(ethtool ${ETH} 2>/dev/null | grep "Speed:" | awk '{print $2}')"
writeConfigKey "ip.${ETH}" "${IP}" "${USER_CONFIG_FILE}"
if [[ "${IP}" =~ ^169\.254\..* ]]; then
echo -e "\r\033[1;37m${DRIVER}@${BUS} (${SPEED} | ${MSG}):\033[0m LINK LOCAL (No DHCP server detected.)"
echo -e "\r\033[1;37m${DRIVER} (${SPEED} | ${MSG}):\033[0m LINK LOCAL (No DHCP server detected.)"
else
echo -e "\r\033[1;37m${DRIVER}@${BUS} (${SPEED} | ${MSG}):\033[0m Access \033[1;34mhttp://${IP}:7681\033[0m to connect to Arc via web."
echo -e "\r\033[1;37m${DRIVER} (${SPEED} | ${MSG}):\033[0m Access \033[1;34mhttp://${IP}:7681\033[0m to connect to Arc via web."
fi
ethtool -s ${ETH} wol g 2>/dev/null
break
fi
if [ ${COUNT} -gt ${BOOTIPWAIT} ]; then
echo -e echo -e "\r\033[1;37m${DRIVER}@${BUS}:\033[0m TIMEOUT"
echo -e echo -e "\r\033[1;37m${DRIVER}:\033[0m TIMEOUT"
deleteConfigKey "ip.${ETH}" "${USER_CONFIG_FILE}"
break
fi
sleep 3
if ethtool ${ETH} 2>/dev/null | grep 'Link detected' | grep -q 'no'; then
echo -e "\r\033[1;37m${DRIVER}@${BUS}:\033[0m NOT CONNECTED"
echo -e "\r\033[1;37m${DRIVER}:\033[0m NOT CONNECTED"
deleteConfigKey "ip.${ETH}" "${USER_CONFIG_FILE}"
break
fi