From dc56b7a0d0acdd025f95cd34ff6e74b4321c4932 Mon Sep 17 00:00:00 2001 From: Ing Date: Thu, 1 Jun 2023 00:03:06 +0800 Subject: [PATCH] Add a prompt for 'multiple loader disks' --- files/board/arpl/overlayfs/opt/arpl/init.sh | 12 ++-- .../arpl/overlayfs/opt/arpl/lang/arpl.pot | 58 ++++++++-------- .../arpl/overlayfs/opt/arpl/lang/zh_CN.mo | Bin 20487 -> 20676 bytes .../arpl/overlayfs/opt/arpl/lang/zh_CN.po | 62 ++++++++++-------- 4 files changed, 70 insertions(+), 62 deletions(-) diff --git a/files/board/arpl/overlayfs/opt/arpl/init.sh b/files/board/arpl/overlayfs/opt/arpl/init.sh index 87f0cc31..4fd0e4de 100755 --- a/files/board/arpl/overlayfs/opt/arpl/init.sh +++ b/files/board/arpl/overlayfs/opt/arpl/init.sh @@ -13,13 +13,13 @@ while true; do CNT=$((${CNT}-1)) sleep 1 done -if [ -z "${LOADER_DISK}" ]; then - die "$(TEXT "Loader disk not found!")" -fi + + +[ -z "${LOADER_DISK}" ] && die "$(TEXT "Loader disk not found!")" NUM_PARTITIONS=$(blkid | grep "${LOADER_DISK}[0-9]\+" | cut -d: -f1 | wc -l) -if [ $NUM_PARTITIONS -ne 3 ]; then - die "$(TEXT "Loader disk not found!")" -fi +[ $NUM_PARTITIONS -lt 3 ] && die "$(TEXT "Loader disk seems to be damaged!")" +[ $NUM_PARTITIONS -gt 3 ] && die "$(TEXT "There are multiple loader disks, please insert only one loader disk!")" + # Check partitions and ignore errors fsck.vfat -aw ${LOADER_DISK}1 >/dev/null 2>&1 || true diff --git a/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot b/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot index 238efee9..1740bda0 100644 --- a/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot +++ b/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-27 13:56+0800\n" +"POT-Creation-Date: 2023-05-31 23:56+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,106 +21,110 @@ msgstr "" msgid "Loader is not configured!" msgstr "" -#: boot.sh:13 init.sh:43 +#: boot.sh:19 init.sh:43 msgid "Welcome to %s" msgstr "" -#: boot.sh:18 -msgid "BOOTING..." -msgstr "" - -#: boot.sh:24 +#: boot.sh:32 msgid "DSM zImage changed" msgstr "" -#: boot.sh:27 boot.sh:39 menu.sh:717 menu.sh:743 menu.sh:812 menu.sh:823 +#: boot.sh:35 boot.sh:47 menu.sh:717 menu.sh:743 menu.sh:812 menu.sh:823 #: menu.sh:852 menu.sh:865 menu.sh:872 menu.sh:1046 menu.sh:1141 msgid "Error" msgstr "" -#: boot.sh:28 menu.sh:866 +#: boot.sh:36 menu.sh:866 msgid "zImage not patched:\\n" msgstr "" -#: boot.sh:36 +#: boot.sh:44 msgid "DSM Ramdisk changed" msgstr "" -#: boot.sh:40 menu.sh:873 +#: boot.sh:48 menu.sh:873 msgid "Ramdisk not patched:\\n" msgstr "" -#: boot.sh:52 +#: boot.sh:60 msgid "Model:" msgstr "" -#: boot.sh:53 +#: boot.sh:61 msgid "Build:" msgstr "" -#: boot.sh:56 +#: boot.sh:64 msgid "" "The current version of arpl does not support booting %s-%s, please rebuild." msgstr "" -#: boot.sh:102 +#: boot.sh:106 msgid "" "Detected %s network cards, but No MACs were customized, they will use the " "original MACs." msgstr "" -#: boot.sh:107 +#: boot.sh:111 msgid "" "Detected %s network cards, but only %s MACs were customized, the rest will " "use the original MACs." msgstr "" -#: boot.sh:138 +#: boot.sh:142 msgid "Cmdline:\\n" msgstr "" -#: boot.sh:143 +#: boot.sh:147 msgid "Reboot to boot directly in DSM" msgstr "" -#: boot.sh:149 init.sh:175 +#: boot.sh:153 init.sh:175 msgid "Detected %s network cards, Waiting IP." msgstr "" -#: boot.sh:155 init.sh:181 +#: boot.sh:160 init.sh:181 msgid "DOWN" msgstr "" -#: boot.sh:159 init.sh:185 +#: boot.sh:164 init.sh:185 msgid "ERROR" msgstr "" -#: boot.sh:165 +#: boot.sh:170 msgid "Access \\033[1;34mhttp://%s:5000\\033[0m to connect the DSM via web." msgstr "" -#: boot.sh:174 +#: boot.sh:179 msgid "Loading DSM kernel..." msgstr "" -#: boot.sh:178 +#: boot.sh:183 msgid "Warning, running kexec with --noefi param, strange things will happen!!" msgstr "" -#: boot.sh:183 +#: boot.sh:188 msgid "Booting..." msgstr "" -#: boot.sh:186 +#: boot.sh:191 msgid "" "[This interface will not be operational. Please use the http://find.synology." "com/ find DSM and connect.]" msgstr "" -#: init.sh:17 init.sh:21 +#: init.sh:18 msgid "Loader disk not found!" msgstr "" +#: init.sh:20 +msgid "Loader disk seems to be damaged!" +msgstr "" + +#: init.sh:21 +msgid "There are multiple loader disks, please insert only one loader disk!" +msgstr "" + #: init.sh:34 init.sh:35 init.sh:36 msgid "Can't mount %s" msgstr "" diff --git a/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.mo b/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.mo index 193029d43ceb32e09c9b386d7d6ba9ea363ee542..9627fc290f2c0eaa9bb1f1e473853c21cc52ff3d 100644 GIT binary patch delta 5522 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 BGxY!f diff --git a/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po b/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po index 71038794..ccec5510 100644 --- a/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po +++ b/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: arpl-i18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-27 13:56+0800\n" -"PO-Revision-Date: 2023-05-27 13:56+0800\n" +"POT-Creation-Date: 2023-05-31 23:56+0800\n" +"PO-Revision-Date: 2023-05-31 23:56+0800\n" "Last-Translator: ing \n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" @@ -20,105 +20,109 @@ msgstr "" msgid "Loader is not configured!" msgstr "引导未配置" -#: boot.sh:13 init.sh:43 +#: boot.sh:19 init.sh:43 msgid "Welcome to %s" msgstr "" -#: boot.sh:18 -msgid "BOOTING..." -msgstr "引导" - -#: boot.sh:24 +#: boot.sh:32 msgid "DSM zImage changed" msgstr "DSM zImage 已更改" -#: boot.sh:27 boot.sh:39 menu.sh:717 menu.sh:743 menu.sh:812 menu.sh:823 +#: boot.sh:35 boot.sh:47 menu.sh:717 menu.sh:743 menu.sh:812 menu.sh:823 #: menu.sh:852 menu.sh:865 menu.sh:872 menu.sh:1046 menu.sh:1141 msgid "Error" msgstr "错误" -#: boot.sh:28 menu.sh:866 +#: boot.sh:36 menu.sh:866 msgid "zImage not patched:\\n" msgstr "zImage打补丁失败:\\n" -#: boot.sh:36 +#: boot.sh:44 msgid "DSM Ramdisk changed" msgstr "DSM Ramdisk 已更改" -#: boot.sh:40 menu.sh:873 +#: boot.sh:48 menu.sh:873 msgid "Ramdisk not patched:\\n" msgstr "Ramdisk打补丁失败:\\n" -#: boot.sh:52 +#: boot.sh:60 msgid "Model:" msgstr "型号: " -#: boot.sh:53 +#: boot.sh:61 msgid "Build:" msgstr "版本: " -#: boot.sh:56 +#: boot.sh:64 msgid "" "The current version of arpl does not support booting %s-%s, please rebuild." msgstr "当前版本的arpl不支持引导 %s-%s, 请重新编译." -#: boot.sh:102 +#: boot.sh:106 msgid "" "Detected %s network cards, but No MACs were customized, they will use the " "original MACs." msgstr "检测到 %s 个网卡, 但是没有自定义 MACs, 它们将使用自身 MACs." -#: boot.sh:107 +#: boot.sh:111 msgid "" "Detected %s network cards, but only %s MACs were customized, the rest will " "use the original MACs." msgstr "检测到 %s 个网卡, 但是仅自定义了 %s 个 MACs, 其他网卡将使用自身 MACs." -#: boot.sh:138 +#: boot.sh:142 msgid "Cmdline:\\n" msgstr "Cmdline:\\n" -#: boot.sh:143 +#: boot.sh:147 msgid "Reboot to boot directly in DSM" msgstr "重启并直接进入DSM引导" -#: boot.sh:149 init.sh:175 +#: boot.sh:153 init.sh:175 msgid "Detected %s network cards, Waiting IP." msgstr "检测到 %s 个网卡, 获取 IP." -#: boot.sh:155 init.sh:181 +#: boot.sh:160 init.sh:181 msgid "DOWN" msgstr "卸载" -#: boot.sh:159 init.sh:185 +#: boot.sh:164 init.sh:185 msgid "ERROR" msgstr "错误" -#: boot.sh:165 +#: boot.sh:170 msgid "Access \\033[1;34mhttp://%s:5000\\033[0m to connect the DSM via web." msgstr "在浏览器中访问 \\033[1;34mhttp://%s:5000\\033[0m 链接 DSM." -#: boot.sh:174 +#: boot.sh:179 msgid "Loading DSM kernel..." msgstr "加载 DSM kernel..." -#: boot.sh:178 +#: boot.sh:183 msgid "Warning, running kexec with --noefi param, strange things will happen!!" msgstr "警告, 使用'--noefi'参数运行'kexec', 可能有不好的事情发生!!" -#: boot.sh:183 +#: boot.sh:188 msgid "Booting..." msgstr "引导中..." -#: boot.sh:186 +#: boot.sh:191 msgid "" "[This interface will not be operational. Please use the http://find.synology." "com/ find DSM and connect.]" msgstr "该界面已不可操作, 请通过 http://find.synology.com/ 查找DSM并链接." -#: init.sh:17 init.sh:21 +#: init.sh:18 msgid "Loader disk not found!" -msgstr "引导磁盘未找到" +msgstr "引导磁盘未找到!" + +#: init.sh:20 +msgid "Loader disk seems to be damaged!" +msgstr "引导磁盘似乎已损坏!" + +#: init.sh:21 +msgid "There are multiple loader disks, please insert only one loader disk!" +msgstr "存在多个引导磁盘,请仅插入一个引导磁盘!" #: init.sh:34 init.sh:35 init.sh:36 msgid "Can't mount %s"