mirror of
https://github.com/RROrg/rr.git
synced 2025-06-21 05:51:05 +08:00
chore: add sn of RS2423RP+, thanks @OrpheeGT
This commit is contained in:
parent
e57959a984
commit
6fe5bab1c7
@ -947,8 +947,8 @@ function cmdlineMenu() {
|
|||||||
case ${RET} in
|
case ${RET} in
|
||||||
0) # ok-button
|
0) # ok-button
|
||||||
sn="$(cat "${TMP_PATH}/resp" | sed -n '1p')"
|
sn="$(cat "${TMP_PATH}/resp" | sed -n '1p')"
|
||||||
mac1="$(cat "${TMP_PATH}/resp" | sed -n '2p')"
|
mac1="$(cat "${TMP_PATH}/resp" | sed -n '2p' | sed 's/[:-]//g')"
|
||||||
mac2="$(cat "${TMP_PATH}/resp" | sed -n '3p')"
|
mac2="$(cat "${TMP_PATH}/resp" | sed -n '3p' | sed 's/[:-]//g')"
|
||||||
if [ -z "${sn}" -o -z "${mac1}" ]; then
|
if [ -z "${sn}" -o -z "${mac1}" ]; then
|
||||||
DIALOG --title "$(TEXT "Cmdline")" \
|
DIALOG --title "$(TEXT "Cmdline")" \
|
||||||
--yesno "$(TEXT "Invalid SN/MAC, retry?")" 0 0
|
--yesno "$(TEXT "Invalid SN/MAC, retry?")" 0 0
|
||||||
@ -2361,7 +2361,6 @@ function advancedMenu() {
|
|||||||
if [ -n "${PLATFORM}" ] && [ "true" = "$(readConfigKey "platforms.${PLATFORM}.dt" "${WORK_PATH}/platforms.yml")" ]; then
|
if [ -n "${PLATFORM}" ] && [ "true" = "$(readConfigKey "platforms.${PLATFORM}.dt" "${WORK_PATH}/platforms.yml")" ]; then
|
||||||
echo "d \"$(TEXT "Custom DTS")\"" >>"${TMP_PATH}/menu"
|
echo "d \"$(TEXT "Custom DTS")\"" >>"${TMP_PATH}/menu"
|
||||||
fi
|
fi
|
||||||
echo "q \"$(TEXT "Switch direct boot:") \Z4${DIRECTBOOT}\Zn\"" >>"${TMP_PATH}/menu"
|
|
||||||
if [ "${DIRECTBOOT}" = "false" ]; then
|
if [ "${DIRECTBOOT}" = "false" ]; then
|
||||||
echo "i \"$(TEXT "Timeout of get ip in boot:") \Z4${BOOTIPWAIT}\Zn\"" >>"${TMP_PATH}/menu"
|
echo "i \"$(TEXT "Timeout of get ip in boot:") \Z4${BOOTIPWAIT}\Zn\"" >>"${TMP_PATH}/menu"
|
||||||
echo "w \"$(TEXT "Timeout of boot wait:") \Z4${BOOTWAIT}\Zn\"" >>"${TMP_PATH}/menu"
|
echo "w \"$(TEXT "Timeout of boot wait:") \Z4${BOOTWAIT}\Zn\"" >>"${TMP_PATH}/menu"
|
||||||
@ -2457,11 +2456,6 @@ function advancedMenu() {
|
|||||||
customDTS
|
customDTS
|
||||||
NEXT="e"
|
NEXT="e"
|
||||||
;;
|
;;
|
||||||
q)
|
|
||||||
[ "${DIRECTBOOT}" = "false" ] && DIRECTBOOT='true' || DIRECTBOOT='false'
|
|
||||||
writeConfigKey "directboot" "${DIRECTBOOT}" "${USER_CONFIG_FILE}"
|
|
||||||
NEXT="q"
|
|
||||||
;;
|
|
||||||
i)
|
i)
|
||||||
ITEMS="$(echo -e "1 \n5 \n10 \n30 \n60 \n")"
|
ITEMS="$(echo -e "1 \n5 \n10 \n30 \n60 \n")"
|
||||||
DIALOG --title "$(TEXT "Advanced")" \
|
DIALOG --title "$(TEXT "Advanced")" \
|
||||||
@ -3498,6 +3492,7 @@ else
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if loaderIsConfigured; then
|
if loaderIsConfigured; then
|
||||||
|
echo "q \"$(TEXT "Direct boot:") \Z4${DIRECTBOOT}\Zn\"" >>"${TMP_PATH}/menu"
|
||||||
echo "b \"$(TEXT "Boot the loader")\"" >>"${TMP_PATH}/menu"
|
echo "b \"$(TEXT "Boot the loader")\"" >>"${TMP_PATH}/menu"
|
||||||
fi
|
fi
|
||||||
echo "l \"$(TEXT "Choose a language")\"" >>"${TMP_PATH}/menu"
|
echo "l \"$(TEXT "Choose a language")\"" >>"${TMP_PATH}/menu"
|
||||||
@ -3569,6 +3564,11 @@ else
|
|||||||
make
|
make
|
||||||
NEXT="b"
|
NEXT="b"
|
||||||
;;
|
;;
|
||||||
|
q)
|
||||||
|
[ "${DIRECTBOOT}" = "false" ] && DIRECTBOOT='true' || DIRECTBOOT='false'
|
||||||
|
writeConfigKey "directboot" "${DIRECTBOOT}" "${USER_CONFIG_FILE}"
|
||||||
|
NEXT="q"
|
||||||
|
;;
|
||||||
b)
|
b)
|
||||||
boot && exit 0 || sleep 5
|
boot && exit 0 || sleep 5
|
||||||
;;
|
;;
|
||||||
|
@ -180,6 +180,13 @@
|
|||||||
middle:
|
middle:
|
||||||
- "QPR"
|
- "QPR"
|
||||||
suffix: "alpha"
|
suffix: "alpha"
|
||||||
|
"RS2423RP+":
|
||||||
|
prefix:
|
||||||
|
- "22B0"
|
||||||
|
middle:
|
||||||
|
- "V3R"
|
||||||
|
suffix: "alpha"
|
||||||
|
macpre: 9009d0
|
||||||
"RS3621xs+":
|
"RS3621xs+":
|
||||||
prefix:
|
prefix:
|
||||||
- "20A0"
|
- "20A0"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user