diff --git a/files/initrd/opt/rr/include/functions.py b/files/initrd/opt/rr/include/functions.py index 4dc91212..aee0a631 100644 --- a/files/initrd/opt/rr/include/functions.py +++ b/files/initrd/opt/rr/include/functions.py @@ -13,7 +13,7 @@ WORK_PATH = os.path.abspath(os.path.dirname(__file__)) @click.group() def cli(): """ - The CLI is a commands to arpl. + The CLI is a commands to RR. """ pass diff --git a/files/initrd/opt/rr/init.sh b/files/initrd/opt/rr/init.sh index 1c14c955..78997cec 100755 --- a/files/initrd/opt/rr/init.sh +++ b/files/initrd/opt/rr/init.sh @@ -175,7 +175,7 @@ echo DSMLOGO="$(readConfigKey "dsmlogo" "${USER_CONFIG_FILE}")" if [ "${DSMLOGO}" = "true" -a -c "/dev/fb0" ]; then IP="$(getIP)" - [ -n "${IP}" ] && URL="http://${IP}:7681" || URL="http://arpl:7681/" + [ -n "${IP}" ] && URL="http://${IP}:7681" || URL="http://rr:7681/" python ${WORK_PATH}/include/functions.py makeqr -d "${URL}" -l "bl" -o "${TMP_PATH}/qrcode.png" [ -f "${TMP_PATH}/qrcode.png" ] && echo | fbv -acufi "${TMP_PATH}/qrcode.png" >/dev/null 2>/dev/null || true fi diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh index f168463c..635fc4fd 100755 --- a/files/initrd/opt/rr/menu.sh +++ b/files/initrd/opt/rr/menu.sh @@ -1257,7 +1257,10 @@ function advancedMenu() { editGrubCfg NEXT="e" ;; - t) tryRecoveryDSM ;; + t) + tryRecoveryDSM + NEXT="e" + ;; s) MSG="" NUMPORTS=0 diff --git a/guide.md b/guide.md index dd844ae4..b0a3ed57 100644 --- a/guide.md +++ b/guide.md @@ -109,23 +109,23 @@ * log: ``` # 内核相关 - sysctl -n kernel.syno_serial # 查看当前鉴权的SN - cat /proc/sys/kernel/syno_serial # 查看当前鉴权的SN - sysctl -n kernel.syno_mac_address1 # 查看当前鉴权的mcac1 (kernel.syno_mac_addresses) - cat /proc/sys/kernel/syno_mac_address1 # 查看当前鉴权的mcac1 (/proc/sys/kernel/syno_mac_addresses) + sysctl -n kernel.syno_serial # 查看当前鉴权的 SN + cat /proc/sys/kernel/syno_serial # 查看当前鉴权的 SN + sysctl -n kernel.syno_mac_address1 # 查看当前鉴权的 mac1 (kernel.syno_mac_addresses) + cat /proc/sys/kernel/syno_mac_address1 # 查看当前鉴权的 mac1 (/proc/sys/kernel/syno_mac_addresses) sysctl -n kernel.syno_internal_netif_num # 查看当前鉴权的网卡数量 cat /proc/sys/kernel/syno_internal_netif_num # 查看当前鉴权的网卡数量 nproc # 查看当前线程数 # 设备相关 lsmod # 查看已加载驱动 - lsusb # 查看USB设备 + lsusb # 查看 USB 设备 lsblk # 查看磁盘设备 - lspci -Qnn # 查看PCI设备 + lspci -Qnn # 查看 PCI 设备 # 驱动相关 ls -ld /sys/class/net/*/device/driver # 查看已加载网卡和对应驱动 - cat /sys/class/net/*/address # 查看已加载网卡的MAC地址 + cat /sys/class/net/*/address # 查看已加载网卡的 MAC 地址 # 磁盘相关 fdisk -l # 查看硬盘信息