diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index 31bf0b5f..e5d2d0b1 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -824,7 +824,7 @@ function modulesMenu() { ;; 2) dialog --backtitle "$(backtitle)" --colors --title "Modules" \ - --infobox "Selecting loaded modules" 0 0 + --infobox "Selecting loaded Modules" 0 0 KOLIST="" for I in $(lsmod | awk -F' ' '{print $1}' | grep -v 'Module'); do KOLIST+="$(getdepends "${PLATFORM}" "${KVER}" "${I}") ${I} " @@ -842,7 +842,7 @@ function modulesMenu() { ;; 3) dialog --backtitle "$(backtitle)" --title "Modules" \ - --infobox "Selecting all modules" 0 0 + --infobox "Selecting all Modules" 0 0 unset USERMODULES declare -A USERMODULES writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}" @@ -855,7 +855,7 @@ function modulesMenu() { ;; 4) dialog --backtitle "$(backtitle)" --title "Modules" \ - --infobox "Deselecting all modules" 0 0 + --infobox "Deselecting all Modules" 0 0 writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}" unset USERMODULES declare -A USERMODULES @@ -869,7 +869,7 @@ function modulesMenu() { echo "${ID} ${DESC} ${ACT}" >>"${TMP_PATH}/opts" done < <(getAllModules "${PLATFORM}" "${KVER}") dialog --backtitle "$(backtitle)" --title "Modules" --aspect 18 \ - --checklist "Select modules to include" 0 0 0 \ + --checklist "Select Modules to include" 0 0 0 \ --file "${TMP_PATH}/opts" 2>"${TMP_PATH}/resp" [ $? -ne 0 ] && continue resp="$(<"${TMP_PATH}/resp")" diff --git a/files/initrd/opt/arc/boot.sh b/files/initrd/opt/arc/boot.sh index 69ac1a5d..e4c1c210 100755 --- a/files/initrd/opt/arc/boot.sh +++ b/files/initrd/opt/arc/boot.sh @@ -181,8 +181,8 @@ elif [ "${DIRECTBOOT}" = "false" ]; then IP="" DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}') COUNT=0 - sleep 2 while true; do + sleep 3 if [[ "${STATICIP}" = "true" && "${N}" = "eth0" && -n "${ARCIP}" && ${BOOTCOUNT} -gt 0 ]]; then ARCIP="$(readConfigKey "arc.ip" "${USER_CONFIG_FILE}")" NETMASK="$(readConfigKey "arc.netmask" "${USER_CONFIG_FILE}")" @@ -200,8 +200,8 @@ elif [ "${DIRECTBOOT}" = "false" ]; then [ ! -n "${IPCON}" ] && IPCON="${IP}" break fi - COUNT=$((${COUNT} + 1)) - if [ ${COUNT} -eq ${BOOTIPWAIT} ]; then + COUNT=$((${COUNT} + 3)) + if [ ${COUNT} -gt ${BOOTIPWAIT} ]; then echo -e "\r${DRIVER}: TIMEOUT." break fi @@ -209,7 +209,6 @@ elif [ "${DIRECTBOOT}" = "false" ]; then echo -e "\r${DRIVER}: NOT CONNECTED" break fi - sleep 1 done done BOOTWAIT="$(readConfigKey "arc.bootwait" "${USER_CONFIG_FILE}")" diff --git a/files/initrd/opt/arc/init.sh b/files/initrd/opt/arc/init.sh index a573adca..f9fe9693 100755 --- a/files/initrd/opt/arc/init.sh +++ b/files/initrd/opt/arc/init.sh @@ -136,9 +136,8 @@ for N in ${ETHX}; do IP="" DRIVER=$(ls -ld /sys/class/net/${N}/device/driver 2>/dev/null | awk -F '/' '{print $NF}') COUNT=0 - sleep 2 while true; do - IP="" + sleep 3 if [[ "${STATICIP}" = "true" && "${N}" = "eth0" && -n "${ARCIP}" && ${BOOTCOUNT} -gt 0 ]]; then ARCIP="$(readConfigKey "arc.ip" "${USER_CONFIG_FILE}")" NETMASK="$(readConfigKey "arc.netmask" "${USER_CONFIG_FILE}")" @@ -155,8 +154,8 @@ for N in ${ETHX}; do echo -e "\r${DRIVER} (${SPEED} | ${MSG}): Access \033[1;34mhttp://${IP}:7681\033[0m to connect to Arc via web." break fi - COUNT=$((${COUNT} + 1)) - if [ ${COUNT} -eq ${BOOTIPWAIT} ]; then + COUNT=$((${COUNT} + 3)) + if [ ${COUNT} -gt ${BOOTIPWAIT} ]; then echo -e "\r${DRIVER}: TIMEOUT" break fi @@ -164,7 +163,6 @@ for N in ${ETHX}; do echo -e "\r${DRIVER}: NOT CONNECTED" break fi - sleep 1 done done