mirror of
https://github.com/RROrg/rr.git
synced 2025-06-21 05:51:05 +08:00
add "boot ips wait time"
This commit is contained in:
parent
f215a28290
commit
e877657479
@ -154,7 +154,9 @@ if [ "${DIRECT}" = "true" ]; then
|
|||||||
reboot
|
reboot
|
||||||
exit 0
|
exit 0
|
||||||
else
|
else
|
||||||
sleep 1
|
(/etc/init.d/S41dhcpcd restart >/dev/null 2>&1 &) || true
|
||||||
|
BOOTIPWAIT="`readConfigKey "bootipwait" "${USER_CONFIG_FILE}"`"
|
||||||
|
sleep ${BOOTIPWAIT}
|
||||||
ETHX=(`ls /sys/class/net/ | grep eth`) # real network cards list
|
ETHX=(`ls /sys/class/net/ | grep eth`) # real network cards list
|
||||||
echo "`printf "$(TEXT "Detected %s network cards, Waiting IP.(For reference only)")" "${#ETHX[@]}"`"
|
echo "`printf "$(TEXT "Detected %s network cards, Waiting IP.(For reference only)")" "${#ETHX[@]}"`"
|
||||||
for N in $(seq 0 $(expr ${#ETHX[@]} - 1)); do
|
for N in $(seq 0 $(expr ${#ETHX[@]} - 1)); do
|
||||||
|
@ -77,6 +77,7 @@ if [ ! -f "${USER_CONFIG_FILE}" ]; then
|
|||||||
writeConfigKey "lkm" "prod" "${USER_CONFIG_FILE}"
|
writeConfigKey "lkm" "prod" "${USER_CONFIG_FILE}"
|
||||||
writeConfigKey "directboot" "false" "${USER_CONFIG_FILE}"
|
writeConfigKey "directboot" "false" "${USER_CONFIG_FILE}"
|
||||||
writeConfigKey "notsetmacs" "false" "${USER_CONFIG_FILE}"
|
writeConfigKey "notsetmacs" "false" "${USER_CONFIG_FILE}"
|
||||||
|
writeConfigKey "bootipwait" "10" "${USER_CONFIG_FILE}"
|
||||||
writeConfigKey "model" "" "${USER_CONFIG_FILE}"
|
writeConfigKey "model" "" "${USER_CONFIG_FILE}"
|
||||||
writeConfigKey "build" "" "${USER_CONFIG_FILE}"
|
writeConfigKey "build" "" "${USER_CONFIG_FILE}"
|
||||||
writeConfigKey "sn" "" "${USER_CONFIG_FILE}"
|
writeConfigKey "sn" "" "${USER_CONFIG_FILE}"
|
||||||
|
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@ -27,6 +27,7 @@ KEYMAP="`readConfigKey "keymap" "${USER_CONFIG_FILE}"`"
|
|||||||
LKM="`readConfigKey "lkm" "${USER_CONFIG_FILE}"`"
|
LKM="`readConfigKey "lkm" "${USER_CONFIG_FILE}"`"
|
||||||
DIRECTBOOT="`readConfigKey "directboot" "${USER_CONFIG_FILE}"`"
|
DIRECTBOOT="`readConfigKey "directboot" "${USER_CONFIG_FILE}"`"
|
||||||
NOTSETMACS="`readConfigKey "notsetmacs" "${USER_CONFIG_FILE}"`"
|
NOTSETMACS="`readConfigKey "notsetmacs" "${USER_CONFIG_FILE}"`"
|
||||||
|
BOOTIPWAIT="`readConfigKey "bootipwait" "${USER_CONFIG_FILE}"`"
|
||||||
SN="`readConfigKey "sn" "${USER_CONFIG_FILE}"`"
|
SN="`readConfigKey "sn" "${USER_CONFIG_FILE}"`"
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
@ -879,6 +880,9 @@ function advancedMenu() {
|
|||||||
fi
|
fi
|
||||||
if loaderIsConfigured; then
|
if loaderIsConfigured; then
|
||||||
echo "q \"$(TEXT "Switch direct boot:") \Z4${DIRECTBOOT}\Zn\"" >> "${TMP_PATH}/menu"
|
echo "q \"$(TEXT "Switch direct boot:") \Z4${DIRECTBOOT}\Zn\"" >> "${TMP_PATH}/menu"
|
||||||
|
if [ "${DIRECTBOOT}" = "false" ]; then
|
||||||
|
echo "w \"$(TEXT "boot IPs wait time:") \Z4${BOOTIPWAIT}\Zn\"" >> "${TMP_PATH}/menu"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
echo "m \"$(TEXT "Switch 'not set MACs':") \Z4${NOTSETMACS}\Zn\"" >> "${TMP_PATH}/menu"
|
echo "m \"$(TEXT "Switch 'not set MACs':") \Z4${NOTSETMACS}\Zn\"" >> "${TMP_PATH}/menu"
|
||||||
echo "u \"$(TEXT "Edit user config file manually")\"" >> "${TMP_PATH}/menu"
|
echo "u \"$(TEXT "Edit user config file manually")\"" >> "${TMP_PATH}/menu"
|
||||||
@ -901,7 +905,7 @@ function advancedMenu() {
|
|||||||
echo "o \"$(TEXT "Development tools")\"" >> "${TMP_PATH}/menu"
|
echo "o \"$(TEXT "Development tools")\"" >> "${TMP_PATH}/menu"
|
||||||
echo "e \"$(TEXT "Exit")\"" >> "${TMP_PATH}/menu"
|
echo "e \"$(TEXT "Exit")\"" >> "${TMP_PATH}/menu"
|
||||||
|
|
||||||
dialog --default-item ${NEXT} --backtitle "`backtitle`" --title "$(TEXT "Advanced")" \
|
dialog --default-item "${NEXT}" --backtitle "`backtitle`" --title "$(TEXT "Advanced")" \
|
||||||
--colors --menu "$(TEXT "Choose the option")" 0 0 0 --file "${TMP_PATH}/menu" \
|
--colors --menu "$(TEXT "Choose the option")" 0 0 0 --file "${TMP_PATH}/menu" \
|
||||||
2>${TMP_PATH}/resp
|
2>${TMP_PATH}/resp
|
||||||
[ $? -ne 0 ] && break
|
[ $? -ne 0 ] && break
|
||||||
@ -915,6 +919,17 @@ function advancedMenu() {
|
|||||||
writeConfigKey "directboot" "${DIRECTBOOT}" "${USER_CONFIG_FILE}"
|
writeConfigKey "directboot" "${DIRECTBOOT}" "${USER_CONFIG_FILE}"
|
||||||
NEXT="e"
|
NEXT="e"
|
||||||
;;
|
;;
|
||||||
|
w)
|
||||||
|
ITEMS="`echo -e "1 \n5 \n10 \n30 \n60 \n"`"
|
||||||
|
dialog --backtitle "`backtitle`" --default-item "${BOOTIPWAIT}" --no-items \
|
||||||
|
--colors --menu "$(TEXT "Choose a waiting time(seconds)")" 0 0 0 ${ITEMS} 2>${TMP_PATH}/resp
|
||||||
|
[ $? -ne 0 ] && return
|
||||||
|
resp=`cat ${TMP_PATH}/resp 2>/dev/null`
|
||||||
|
[ -z "${resp}" ] && return
|
||||||
|
BOOTIPWAIT=${resp}
|
||||||
|
writeConfigKey "bootipwait" "${BOOTIPWAIT}" "${USER_CONFIG_FILE}"
|
||||||
|
NEXT="e"
|
||||||
|
;;
|
||||||
m) [ "${NOTSETMACS}" = "false" ] && NOTSETMACS='true' || NOTSETMACS='false'
|
m) [ "${NOTSETMACS}" = "false" ] && NOTSETMACS='true' || NOTSETMACS='false'
|
||||||
writeConfigKey "notsetmacs" "${NOTSETMACS}" "${USER_CONFIG_FILE}"
|
writeConfigKey "notsetmacs" "${NOTSETMACS}" "${USER_CONFIG_FILE}"
|
||||||
NEXT="e"
|
NEXT="e"
|
||||||
@ -1301,7 +1316,7 @@ function languageMenu() {
|
|||||||
dialog --backtitle "`backtitle`" --default-item "${LAYOUT}" --no-items \
|
dialog --backtitle "`backtitle`" --default-item "${LAYOUT}" --no-items \
|
||||||
--menu "$(TEXT "Choose a language")" 0 0 0 ${ITEMS} 2>${TMP_PATH}/resp
|
--menu "$(TEXT "Choose a language")" 0 0 0 ${ITEMS} 2>${TMP_PATH}/resp
|
||||||
[ $? -ne 0 ] && return
|
[ $? -ne 0 ] && return
|
||||||
resp=`cat /tmp/resp 2>/dev/null`
|
resp=`cat ${TMP_PATH}/resp 2>/dev/null`
|
||||||
[ -z "${resp}" ] && return
|
[ -z "${resp}" ] && return
|
||||||
LANGUAGE=${resp}
|
LANGUAGE=${resp}
|
||||||
echo "${LANGUAGE}.UTF-8" > ${BOOTLOADER_PATH}/.locale
|
echo "${LANGUAGE}.UTF-8" > ${BOOTLOADER_PATH}/.locale
|
||||||
@ -1323,9 +1338,9 @@ function keymapMenu() {
|
|||||||
done < <(cd /usr/share/keymaps/i386/${LAYOUT}; ls *.map.gz)
|
done < <(cd /usr/share/keymaps/i386/${LAYOUT}; ls *.map.gz)
|
||||||
dialog --backtitle "`backtitle`" --no-items --default-item "${KEYMAP}" \
|
dialog --backtitle "`backtitle`" --no-items --default-item "${KEYMAP}" \
|
||||||
--menu "$(TEXT "Choice a keymap")" 0 0 0 ${OPTIONS} \
|
--menu "$(TEXT "Choice a keymap")" 0 0 0 ${OPTIONS} \
|
||||||
2>/tmp/resp
|
2>${TMP_PATH}/resp
|
||||||
[ $? -ne 0 ] && return
|
[ $? -ne 0 ] && return
|
||||||
resp=`cat /tmp/resp 2>/dev/null`
|
resp=`cat ${TMP_PATH}/resp 2>/dev/null`
|
||||||
[ -z "${resp}" ] && return
|
[ -z "${resp}" ] && return
|
||||||
KEYMAP=${resp}
|
KEYMAP=${resp}
|
||||||
writeConfigKey "layout" "${LAYOUT}" "${USER_CONFIG_FILE}"
|
writeConfigKey "layout" "${LAYOUT}" "${USER_CONFIG_FILE}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user