From a9a569b971de395477d1664a0b2407200c7ad9e0 Mon Sep 17 00:00:00 2001 From: Ing Date: Mon, 24 Apr 2023 18:37:08 +0800 Subject: [PATCH] add format disk and persistence of arpl modifications. mod mirror select from curl to ping. mod waiting ip from 30s to 8s. --- files/board/arpl/overlayfs/opt/arpl/boot.sh | 2 +- .../arpl/overlayfs/opt/arpl/lang/arpl.pot | 192 ++++++++++------- .../arpl/overlayfs/opt/arpl/lang/zh_CN.mo | Bin 13678 -> 14516 bytes .../arpl/overlayfs/opt/arpl/lang/zh_CN.po | 194 +++++++++++------- files/board/arpl/overlayfs/opt/arpl/menu.sh | 53 ++++- 5 files changed, 282 insertions(+), 159 deletions(-) diff --git a/files/board/arpl/overlayfs/opt/arpl/boot.sh b/files/board/arpl/overlayfs/opt/arpl/boot.sh index 087851a5..48b086c6 100755 --- a/files/board/arpl/overlayfs/opt/arpl/boot.sh +++ b/files/board/arpl/overlayfs/opt/arpl/boot.sh @@ -146,7 +146,7 @@ else echo -en "\r${ETHX[${N}]}: $(TEXT "DOWN")\n" break fi - if [ ${COUNT} -eq 30 ]; then + if [ ${COUNT} -eq 8 ]; then # Under normal circumstances, no errors should occur here. echo -en "\r${ETHX[${N}]}: $(TEXT "ERROR")\n" break fi diff --git a/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot b/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot index 483cea27..368a5429 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-04-24 02:43+0800\n" +"POT-Creation-Date: 2023-04-24 18:26+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -200,7 +200,7 @@ msgstr "" msgid "Reconfiguring Synoinfo, Addons and Modules" msgstr "" -#: menu.sh:187 menu.sh:236 menu.sh:355 menu.sh:468 menu.sh:877 menu.sh:1023 +#: menu.sh:187 menu.sh:236 menu.sh:355 menu.sh:468 menu.sh:920 menu.sh:1066 msgid "Choose a option" msgstr "" @@ -216,7 +216,7 @@ msgstr "" msgid "Please enter a serial number " msgstr "" -#: menu.sh:206 menu.sh:425 menu.sh:970 menu.sh:1202 +#: menu.sh:206 menu.sh:425 menu.sh:1013 menu.sh:1245 msgid "Alert" msgstr "" @@ -244,8 +244,8 @@ msgstr "" msgid "Download a external addon" msgstr "" -#: menu.sh:242 menu.sh:352 menu.sh:464 menu.sh:760 menu.sh:882 menu.sh:1029 -#: menu.sh:1251 +#: menu.sh:242 menu.sh:352 menu.sh:464 menu.sh:762 menu.sh:925 menu.sh:1072 +#: menu.sh:1294 msgid "Exit" msgstr "" @@ -501,7 +501,7 @@ msgstr "" msgid "Addon %s not found!" msgstr "" -#: menu.sh:734 menu.sh:1269 +#: menu.sh:734 menu.sh:1312 msgid "Cleaning" msgstr "" @@ -513,7 +513,7 @@ msgstr "" msgid "Switch LKM version:" msgstr "" -#: menu.sh:751 menu.sh:867 menu.sh:893 menu.sh:904 menu.sh:917 menu.sh:923 +#: menu.sh:751 menu.sh:910 menu.sh:936 menu.sh:947 menu.sh:960 menu.sh:966 msgid "Modules" msgstr "" @@ -534,274 +534,314 @@ msgid "Show SATA(s) # ports and drives" msgstr "" #: menu.sh:759 +msgid "Format disk(s) # SATA and NVME" +msgstr "" + +#: menu.sh:760 msgid "Custom dts location:/mnt/p1/model.dts # Need rebuild" msgstr "" -#: menu.sh:762 +#: menu.sh:761 menu.sh:840 menu.sh:851 +msgid "Persistence of arpl modifications" +msgstr "" + +#: menu.sh:764 menu.sh:822 msgid "Advanced" msgstr "" -#: menu.sh:763 menu.sh:1254 +#: menu.sh:765 menu.sh:1297 msgid "Choose the option" msgstr "" -#: menu.sh:807 +#: menu.sh:809 msgid "\\nTotal of ports: %s\\n" msgstr "" -#: menu.sh:808 +#: menu.sh:810 msgid "" "\\nPorts with color \\Z1red\\Zn as DUMMY, color \\Z2\\Zbgreen\\Zn has drive " "connected." msgstr "" -#: menu.sh:809 +#: menu.sh:811 msgid "\\nRecommended value:" msgstr "" -#: menu.sh:810 +#: menu.sh:812 msgid "\\nDiskIdxMap:" msgstr "" -#: menu.sh:822 menu.sh:850 menu.sh:857 +#: menu.sh:821 menu.sh:826 menu.sh:833 +msgid "Format disk" +msgstr "" + +#: menu.sh:827 +msgid "" +"Warning:\\nThis operation is irreversible. Please backup important data. Do " +"you want to continue?" +msgstr "" + +#: menu.sh:834 +msgid "Formatting ..." +msgstr "" + +#: menu.sh:835 +msgid "Formatting is complete." +msgstr "" + +#: menu.sh:841 +msgid "" +"Warning:\\nDo not terminate midway, otherwise it may cause damage to the " +"arpl. Do you want to continue?" +msgstr "" + +#: menu.sh:852 +msgid "Persisting ..." +msgstr "" + +#: menu.sh:853 +msgid "Persisting is complete." +msgstr "" + +#: menu.sh:865 menu.sh:893 menu.sh:900 msgid "Try recovery DSM" msgstr "" -#: menu.sh:823 +#: menu.sh:866 msgid "Trying to recovery a DSM installed system" msgstr "" -#: menu.sh:844 +#: menu.sh:887 msgid "Found a installation:\\nModel: %s\\nBuildnumber: %s" msgstr "" -#: menu.sh:848 +#: menu.sh:891 msgid "\\nSerial: %s" msgstr "" -#: menu.sh:858 +#: menu.sh:901 msgid "Unfortunately I couldn't mount the DSM partition!" msgstr "" -#: menu.sh:868 +#: menu.sh:911 msgid "Reading modules" msgstr "" -#: menu.sh:878 +#: menu.sh:921 msgid "Show selected modules" msgstr "" -#: menu.sh:879 +#: menu.sh:922 msgid "Select all modules" msgstr "" -#: menu.sh:880 +#: menu.sh:923 msgid "Deselect all modules" msgstr "" -#: menu.sh:881 +#: menu.sh:924 msgid "Choose modules to include" msgstr "" -#: menu.sh:890 +#: menu.sh:933 msgid "User modules" msgstr "" -#: menu.sh:894 +#: menu.sh:937 msgid "Selecting all modules" msgstr "" -#: menu.sh:905 +#: menu.sh:948 msgid "Deselecting all modules" msgstr "" -#: menu.sh:918 +#: menu.sh:961 msgid "Select modules to include" msgstr "" -#: menu.sh:924 +#: menu.sh:967 msgid "Writing to user config" msgstr "" -#: menu.sh:945 +#: menu.sh:988 msgid "Edit with caution" msgstr "" -#: menu.sh:951 +#: menu.sh:994 msgid "Invalid YAML format" msgstr "" -#: menu.sh:971 +#: menu.sh:1014 msgid "Config changed, would you like to rebuild the loader?" msgstr "" -#: menu.sh:983 menu.sh:1245 +#: menu.sh:1026 menu.sh:1288 msgid "Choose a language" msgstr "" -#: menu.sh:996 +#: menu.sh:1039 msgid "Choose a layout" msgstr "" -#: menu.sh:1006 +#: menu.sh:1049 msgid "Choice a keymap" msgstr "" -#: menu.sh:1024 menu.sh:1034 menu.sh:1039 menu.sh:1045 menu.sh:1049 -#: menu.sh:1054 menu.sh:1060 menu.sh:1067 menu.sh:1071 menu.sh:1088 +#: menu.sh:1067 menu.sh:1077 menu.sh:1082 menu.sh:1088 menu.sh:1092 +#: menu.sh:1097 menu.sh:1103 menu.sh:1110 menu.sh:1114 menu.sh:1131 msgid "Update arpl" msgstr "" -#: menu.sh:1025 menu.sh:1096 menu.sh:1100 menu.sh:1104 menu.sh:1108 -#: menu.sh:1112 menu.sh:1117 menu.sh:1127 +#: menu.sh:1068 menu.sh:1139 menu.sh:1143 menu.sh:1147 menu.sh:1151 +#: menu.sh:1155 menu.sh:1160 menu.sh:1170 msgid "Update addons" msgstr "" -#: menu.sh:1026 menu.sh:1132 menu.sh:1136 menu.sh:1140 menu.sh:1144 -#: menu.sh:1148 menu.sh:1153 +#: menu.sh:1069 menu.sh:1175 menu.sh:1179 menu.sh:1183 menu.sh:1187 +#: menu.sh:1191 menu.sh:1196 msgid "Update LKMs" msgstr "" -#: menu.sh:1027 +#: menu.sh:1070 msgid "Update modules" msgstr "" -#: menu.sh:1028 +#: menu.sh:1071 msgid "Set proxy server" msgstr "" -#: menu.sh:1035 menu.sh:1097 menu.sh:1133 menu.sh:1158 +#: menu.sh:1078 menu.sh:1140 menu.sh:1176 menu.sh:1201 msgid "Checking last version" msgstr "" -#: menu.sh:1040 menu.sh:1101 menu.sh:1137 menu.sh:1162 +#: menu.sh:1083 menu.sh:1144 menu.sh:1180 menu.sh:1205 msgid "Error checking new version" msgstr "" -#: menu.sh:1046 +#: menu.sh:1089 msgid "No new version. Actual version is %s\\nForce update?" msgstr "" -#: menu.sh:1050 +#: menu.sh:1093 msgid "Downloading last version %s" msgstr "" -#: menu.sh:1055 +#: menu.sh:1098 msgid "Error downloading update file" msgstr "" -#: menu.sh:1061 +#: menu.sh:1104 msgid "Error extracting update file" msgstr "" -#: menu.sh:1068 +#: menu.sh:1111 msgid "Checksum do not match!" msgstr "" -#: menu.sh:1072 +#: menu.sh:1115 msgid "Installing new files" msgstr "" -#: menu.sh:1089 +#: menu.sh:1132 msgid "Arpl updated with success to %s!\\nReboot?" msgstr "" -#: menu.sh:1105 menu.sh:1141 menu.sh:1167 +#: menu.sh:1148 menu.sh:1184 menu.sh:1210 msgid "Downloading last version" msgstr "" -#: menu.sh:1109 +#: menu.sh:1152 msgid "Error downloading new version" msgstr "" -#: menu.sh:1113 menu.sh:1149 +#: menu.sh:1156 menu.sh:1192 msgid "Extracting last version" msgstr "" -#: menu.sh:1118 +#: menu.sh:1161 msgid "Installing new addons" msgstr "" -#: menu.sh:1128 +#: menu.sh:1171 msgid "Addons updated with success!" msgstr "" -#: menu.sh:1145 menu.sh:1171 +#: menu.sh:1188 menu.sh:1214 msgid "Error downloading last version" msgstr "" -#: menu.sh:1154 +#: menu.sh:1197 msgid "LKMs updated with success!" msgstr "" -#: menu.sh:1157 menu.sh:1161 menu.sh:1166 menu.sh:1170 menu.sh:1185 +#: menu.sh:1200 menu.sh:1204 menu.sh:1209 menu.sh:1213 menu.sh:1228 msgid "Update Modules" msgstr "" -#: menu.sh:1186 +#: menu.sh:1229 msgid "Modules updated with success!" msgstr "" -#: menu.sh:1191 +#: menu.sh:1234 msgid "Set Proxy Server" msgstr "" -#: menu.sh:1192 +#: menu.sh:1235 msgid "Please enter a proxy server url" msgstr "" -#: menu.sh:1203 +#: menu.sh:1246 msgid "Invalid proxy server url, continue?" msgstr "" -#: menu.sh:1226 +#: menu.sh:1269 msgid "Choose a model" msgstr "" -#: menu.sh:1228 +#: menu.sh:1271 msgid "Choose a Build Number" msgstr "" -#: menu.sh:1229 +#: menu.sh:1272 msgid "Choose a serial number" msgstr "" -#: menu.sh:1231 +#: menu.sh:1274 msgid "Addons" msgstr "" -#: menu.sh:1232 +#: menu.sh:1275 msgid "Cmdline menu" msgstr "" -#: menu.sh:1233 +#: menu.sh:1276 msgid "Synoinfo menu" msgstr "" -#: menu.sh:1236 +#: menu.sh:1279 msgid "Advanced menu" msgstr "" -#: menu.sh:1239 +#: menu.sh:1282 msgid "Build the loader" msgstr "" -#: menu.sh:1243 +#: menu.sh:1286 msgid "Boot the loader" msgstr "" -#: menu.sh:1246 +#: menu.sh:1289 msgid "Choose a keymap" msgstr "" -#: menu.sh:1248 +#: menu.sh:1291 msgid "Clean disk cache" msgstr "" -#: menu.sh:1250 +#: menu.sh:1293 msgid "Update menu" msgstr "" -#: menu.sh:1276 +#: menu.sh:1319 msgid "Call \\033[1;32mmenu.sh\\033[0m to return to menu" 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 b50f1ae9058370c2fb8f65d2070a4479485806c2..d1761c37154929e6aa67bc9aead39b3af5657ad6 100644 GIT binary patch delta 5045 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 delta 4208 zcmYk@5Hd2b2L+De{1Cch30{q(um;znx3uC#cpCfS$5@Exu|F2{ z3V|j=Iof_T=HNWMFoZ-{#7Q<4^*9{YAm0r;(T-biHXg>F7z)z$`RD)!p!W|$I~s?T zcokOQZJ399(EDG)i}6(~qyO+XPI^<3%dj2sVC;wE(fS402Unp3*b?g>jXodiUqQwg zPRH_xXvhDG<@0Dec}3~=OEI7R!(>kUVvQAeBf3Nz&;}aNk#9#=WM{13i(@DsLLb2= zm|7u5T|+q^t8p1-;giT1!qdo{!$C~=OisiLAEFJkqa*FYhYj~f+74B*JOhVPUV_W8 z5nZuQ(1tVllI7m$1S-(IF$o9YwKxtpT*UhO><>`!Eli>-@h8m1zawJ_ZRmYjwBjS` zj^0;_e(!P|gbSk^(UshRPH-=}0;Sb2>3upVX{xupC{1G03f<7B9m!v3?ISx6q2V{};@}L^~%o^d&mub7(_@ zST_fDB|3ol=-ya{-oGB5!5ugPo6r?F5q%T={(I=2_yYZY7L7ZQB4i+mP|k@R&p>Cq z5`A`eMIS)$~p8`{xlpI@AAzZ%_J)6tdMjCl!8 zwsK;}JJ1Weqx;dNKNiccqkH5XbVh%T<$t3C_y%X-Aa<++TY>f15d9eKXD&Z~HMkfP zF6{wMZ1@EF#XsUG{0F*}g-l~)2D3*SsN)rwg3EC}K8Jq)f9U4R=2c-Eg<`b*3CLoG zdFb9*hdzSMr96Ktwo_pPJK_zy&>8KE^`~O}+c=Z@cVqcto{QfbjH;=p)Nu2RneN=%Y={;=~y*MPI8;n3@^-zBZ$KVn6!Rc@iDi`_VRJn}iH{UyPTa z*SDaX`SDoZjSf5+%fCn3O@uR?lyl)TbY%TTrdOmG9l$uu#hI9cwdj3|(HSg92YhEN zH%6PIhvM}&(3So(`u#TSN&n$L@rLYC>6sRwD={3IT$qY36`k=% z=zzb(9@v#x`6vp}av9oQHM){FU@zbQ+d1LQ3ER*a9l-8*5^eBJ^bvi4Hq?&JAdF5A zv>UoIC20K!wBt(jwVRGrcoX_oHO2ZPnD9M4!$~H7jyBMa)_;X|*ry`h(Gave5gphp zbfAmSj#i*=(Y@$^UPNEFB)asc(3Luiw)1%f>+gkg@rFK^rf;l3Z@dP*@%m^zx*0d2 zOaB1+{e$TJZ=jFp{aF7sx^hMQ?s|PV`e-Mh?Jlfj{qs3lPK8Uh5%X|cv-iJP# zb}Yf%s`MipiFR0nUSAh&L|3pG9pJI(+i1t1qL2K)2~J$XftRH(ltru2`YGrmnG@@4 zqf4=n`qgL$ThRNSLTC6aI`HFIfH~Fae?*9H9^cOgr_})KH*bb?qIGW(GhnL7}#EmhNc>IR=yssks z-h^Kg|8DnaBoB}>vYvD!_mKspkaQfkbe!OBGK}~OxRH3UQ4^_uYVD%nZuD@sjw6G~ zW^$a|N<3a5vxqz0<62ThR*_|759v63O+CJ!CiR)iXJst=n(s{QHcqCH3*v=QIDj0E zoulIzHw#N#L#Po|O4\n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" @@ -199,7 +199,7 @@ msgstr "该版本不支持UEFI启动, 请选择其他版本或者切换启动模 msgid "Reconfiguring Synoinfo, Addons and Modules" msgstr "重新配置 Syninfo, 插件和模块" -#: menu.sh:187 menu.sh:236 menu.sh:355 menu.sh:468 menu.sh:877 menu.sh:1023 +#: menu.sh:187 menu.sh:236 menu.sh:355 menu.sh:468 menu.sh:920 menu.sh:1066 msgid "Choose a option" msgstr "设置" @@ -215,7 +215,7 @@ msgstr "输入SN" msgid "Please enter a serial number " msgstr "请输入SN " -#: menu.sh:206 menu.sh:425 menu.sh:970 menu.sh:1202 +#: menu.sh:206 menu.sh:425 menu.sh:1013 menu.sh:1245 msgid "Alert" msgstr "警告" @@ -243,8 +243,8 @@ msgstr "显示所有可用插件" msgid "Download a external addon" msgstr "下载外部插件" -#: menu.sh:242 menu.sh:352 menu.sh:464 menu.sh:760 menu.sh:882 menu.sh:1029 -#: menu.sh:1251 +#: menu.sh:242 menu.sh:352 menu.sh:464 menu.sh:762 menu.sh:925 menu.sh:1072 +#: menu.sh:1294 msgid "Exit" msgstr "退出" @@ -500,7 +500,7 @@ msgstr "拷贝文件: " msgid "Addon %s not found!" msgstr "插件 %s 未找到!" -#: menu.sh:734 menu.sh:1269 +#: menu.sh:734 menu.sh:1312 msgid "Cleaning" msgstr "清除中" @@ -512,7 +512,7 @@ msgstr "已就绪!" msgid "Switch LKM version:" msgstr "选择LKM版本:" -#: menu.sh:751 menu.sh:867 menu.sh:893 menu.sh:904 menu.sh:917 menu.sh:923 +#: menu.sh:751 menu.sh:910 menu.sh:936 menu.sh:947 menu.sh:960 menu.sh:966 msgid "Modules" msgstr "模块" @@ -533,274 +533,314 @@ msgid "Show SATA(s) # ports and drives" msgstr "显示SATA(s) # 端口和驱动器" #: menu.sh:759 +msgid "Format disk(s) # SATA and NVME" +msgstr "格式化磁盘(s) # SATA 和 NVME" + +#: menu.sh:760 msgid "Custom dts location:/mnt/p1/model.dts # Need rebuild" msgstr "自定义 dts 文件位置:/mnt/p1/model.dts # 需要重新编译" -#: menu.sh:762 +#: menu.sh:761 menu.sh:840 menu.sh:851 +msgid "Persistence of arpl modifications" +msgstr "持久化arpl的修改" + +#: menu.sh:764 menu.sh:822 msgid "Advanced" msgstr "高级" -#: menu.sh:763 menu.sh:1254 +#: menu.sh:765 menu.sh:1297 msgid "Choose the option" msgstr "设置" -#: menu.sh:807 +#: menu.sh:809 msgid "\\nTotal of ports: %s\\n" msgstr "\\n端口总数: %s\\n" -#: menu.sh:808 +#: menu.sh:810 msgid "" "\\nPorts with color \\Z1red\\Zn as DUMMY, color \\Z2\\Zbgreen\\Zn has drive " "connected." msgstr "\\n\\Z1红色\\Zn 为模拟端口, \\Z2\\Zb绿色\\Zn 为已驱动的物理端口." -#: menu.sh:809 +#: menu.sh:811 msgid "\\nRecommended value:" msgstr "\\n建议值:" -#: menu.sh:810 +#: menu.sh:812 msgid "\\nDiskIdxMap:" msgstr "\\nDiskIdxMap:" -#: menu.sh:822 menu.sh:850 menu.sh:857 +#: menu.sh:821 menu.sh:826 menu.sh:833 +msgid "Format disk" +msgstr "格式话磁盘" + +#: menu.sh:827 +msgid "" +"Warning:\\nThis operation is irreversible. Please backup important data. Do " +"you want to continue?" +msgstr "警告:\\n该操作不可逆, 请提前备份重要数据. 是否继续?" + +#: menu.sh:834 +msgid "Formatting ..." +msgstr "格式化中..." + +#: menu.sh:835 +msgid "Formatting is complete." +msgstr "格式化完成." + +#: menu.sh:841 +msgid "" +"Warning:\\nDo not terminate midway, otherwise it may cause damage to the " +"arpl. Do you want to continue?" +msgstr "警告:\\n请不要中途停止, 否则将导致arpl引导损毁, 是否继续?" + +#: menu.sh:852 +msgid "Persisting ..." +msgstr "持久化中..." + +#: menu.sh:853 +msgid "Persisting is complete." +msgstr "持久化完成." + +#: menu.sh:865 menu.sh:893 menu.sh:900 msgid "Try recovery DSM" msgstr "尝试恢复DSM系统" -#: menu.sh:823 +#: menu.sh:866 msgid "Trying to recovery a DSM installed system" msgstr "尝试恢复已安装的DSM系统中" -#: menu.sh:844 +#: menu.sh:887 msgid "Found a installation:\\nModel: %s\\nBuildnumber: %s" msgstr "找到已安装:\\n型号: %s\\n版本: %s" -#: menu.sh:848 +#: menu.sh:891 msgid "\\nSerial: %s" msgstr "\\nSN: %s" -#: menu.sh:858 +#: menu.sh:901 msgid "Unfortunately I couldn't mount the DSM partition!" msgstr "很遗憾, 我无法挂载DSM分区!" -#: menu.sh:868 +#: menu.sh:911 msgid "Reading modules" msgstr "读取模块中" -#: menu.sh:878 +#: menu.sh:921 msgid "Show selected modules" msgstr "显示已加载的模块" -#: menu.sh:879 +#: menu.sh:922 msgid "Select all modules" msgstr "选择所有模块" -#: menu.sh:880 +#: menu.sh:923 msgid "Deselect all modules" msgstr "取消所有模块" -#: menu.sh:881 +#: menu.sh:924 msgid "Choose modules to include" msgstr "选择要加载的模块" -#: menu.sh:890 +#: menu.sh:933 msgid "User modules" msgstr "模块" -#: menu.sh:894 +#: menu.sh:937 msgid "Selecting all modules" msgstr "全选所有模块" -#: menu.sh:905 +#: menu.sh:948 msgid "Deselecting all modules" msgstr "取消所有模块" -#: menu.sh:918 +#: menu.sh:961 msgid "Select modules to include" msgstr "选择要加载的插件" -#: menu.sh:924 +#: menu.sh:967 msgid "Writing to user config" msgstr "写入用户配置" -#: menu.sh:945 +#: menu.sh:988 msgid "Edit with caution" msgstr "请谨慎编辑" -#: menu.sh:951 +#: menu.sh:994 msgid "Invalid YAML format" msgstr "无效的YAML格式" -#: menu.sh:971 +#: menu.sh:1014 msgid "Config changed, would you like to rebuild the loader?" msgstr "配置已更改, 是否重新编译引导?" -#: menu.sh:983 menu.sh:1245 +#: menu.sh:1026 menu.sh:1288 msgid "Choose a language" msgstr "选择语言" -#: menu.sh:996 +#: menu.sh:1039 msgid "Choose a layout" msgstr "选择布局" -#: menu.sh:1006 +#: menu.sh:1049 msgid "Choice a keymap" msgstr "选择键盘" -#: menu.sh:1024 menu.sh:1034 menu.sh:1039 menu.sh:1045 menu.sh:1049 -#: menu.sh:1054 menu.sh:1060 menu.sh:1067 menu.sh:1071 menu.sh:1088 +#: menu.sh:1067 menu.sh:1077 menu.sh:1082 menu.sh:1088 menu.sh:1092 +#: menu.sh:1097 menu.sh:1103 menu.sh:1110 menu.sh:1114 menu.sh:1131 msgid "Update arpl" msgstr "更新arpl" -#: menu.sh:1025 menu.sh:1096 menu.sh:1100 menu.sh:1104 menu.sh:1108 -#: menu.sh:1112 menu.sh:1117 menu.sh:1127 +#: menu.sh:1068 menu.sh:1139 menu.sh:1143 menu.sh:1147 menu.sh:1151 +#: menu.sh:1155 menu.sh:1160 menu.sh:1170 msgid "Update addons" msgstr "更新插件" -#: menu.sh:1026 menu.sh:1132 menu.sh:1136 menu.sh:1140 menu.sh:1144 -#: menu.sh:1148 menu.sh:1153 +#: menu.sh:1069 menu.sh:1175 menu.sh:1179 menu.sh:1183 menu.sh:1187 +#: menu.sh:1191 menu.sh:1196 msgid "Update LKMs" msgstr "更新LKMs" -#: menu.sh:1027 +#: menu.sh:1070 msgid "Update modules" msgstr "更新模块" -#: menu.sh:1028 +#: menu.sh:1071 msgid "Set proxy server" msgstr "设置代理" -#: menu.sh:1035 menu.sh:1097 menu.sh:1133 menu.sh:1158 +#: menu.sh:1078 menu.sh:1140 menu.sh:1176 menu.sh:1201 msgid "Checking last version" msgstr "检测新版本中" -#: menu.sh:1040 menu.sh:1101 menu.sh:1137 menu.sh:1162 +#: menu.sh:1083 menu.sh:1144 menu.sh:1180 menu.sh:1205 msgid "Error checking new version" msgstr "检测新版本错误" -#: menu.sh:1046 +#: menu.sh:1089 msgid "No new version. Actual version is %s\\nForce update?" msgstr "没有新版本. 实际版本为 %s\\n强制更新?" -#: menu.sh:1050 +#: menu.sh:1093 msgid "Downloading last version %s" msgstr "下载新版本 %s 中" -#: menu.sh:1055 +#: menu.sh:1098 msgid "Error downloading update file" msgstr "下载新版本错误" -#: menu.sh:1061 +#: menu.sh:1104 msgid "Error extracting update file" msgstr "更新文件解压错误" -#: menu.sh:1068 +#: menu.sh:1111 msgid "Checksum do not match!" msgstr "Checksum不匹配!" -#: menu.sh:1072 +#: menu.sh:1115 msgid "Installing new files" msgstr "安装更新中" -#: menu.sh:1089 +#: menu.sh:1132 msgid "Arpl updated with success to %s!\\nReboot?" msgstr "Arpl更新成功 %s!\\n重启?" -#: menu.sh:1105 menu.sh:1141 menu.sh:1167 +#: menu.sh:1148 menu.sh:1184 menu.sh:1210 msgid "Downloading last version" msgstr "下载新版本中" -#: menu.sh:1109 +#: menu.sh:1152 msgid "Error downloading new version" msgstr "下载新版本错误" -#: menu.sh:1113 menu.sh:1149 +#: menu.sh:1156 menu.sh:1192 msgid "Extracting last version" msgstr "解压新版本" -#: menu.sh:1118 +#: menu.sh:1161 msgid "Installing new addons" msgstr "安装新插件中" -#: menu.sh:1128 +#: menu.sh:1171 msgid "Addons updated with success!" msgstr "插件更新成功!" -#: menu.sh:1145 menu.sh:1171 +#: menu.sh:1188 menu.sh:1214 msgid "Error downloading last version" msgstr "下载新版本错误" -#: menu.sh:1154 +#: menu.sh:1197 msgid "LKMs updated with success!" msgstr "LKMs更新成功!" -#: menu.sh:1157 menu.sh:1161 menu.sh:1166 menu.sh:1170 menu.sh:1185 +#: menu.sh:1200 menu.sh:1204 menu.sh:1209 menu.sh:1213 menu.sh:1228 msgid "Update Modules" msgstr "更新模块" -#: menu.sh:1186 +#: menu.sh:1229 msgid "Modules updated with success!" msgstr "模块更新成功!" -#: menu.sh:1191 +#: menu.sh:1234 msgid "Set Proxy Server" msgstr "设置代理" -#: menu.sh:1192 +#: menu.sh:1235 msgid "Please enter a proxy server url" msgstr "请输入代理服务器url" -#: menu.sh:1203 +#: menu.sh:1246 msgid "Invalid proxy server url, continue?" msgstr "无效的代理服务器url,是否继续?" -#: menu.sh:1226 +#: menu.sh:1269 msgid "Choose a model" msgstr "选择型号" -#: menu.sh:1228 +#: menu.sh:1271 msgid "Choose a Build Number" msgstr "选择版本" -#: menu.sh:1229 +#: menu.sh:1272 msgid "Choose a serial number" msgstr "选择SN" -#: menu.sh:1231 +#: menu.sh:1274 msgid "Addons" msgstr "插件" -#: menu.sh:1232 +#: menu.sh:1275 msgid "Cmdline menu" msgstr "设置Cmdline" -#: menu.sh:1233 +#: menu.sh:1276 msgid "Synoinfo menu" msgstr "设置Synoinfo" -#: menu.sh:1236 +#: menu.sh:1279 msgid "Advanced menu" msgstr "高级设置" -#: menu.sh:1239 +#: menu.sh:1282 msgid "Build the loader" msgstr "编译引导" -#: menu.sh:1243 +#: menu.sh:1286 msgid "Boot the loader" msgstr "启动" -#: menu.sh:1246 +#: menu.sh:1289 msgid "Choose a keymap" msgstr "选择键盘" -#: menu.sh:1248 +#: menu.sh:1291 msgid "Clean disk cache" msgstr "清除磁盘缓存" -#: menu.sh:1250 +#: menu.sh:1293 msgid "Update menu" msgstr "更新" -#: menu.sh:1276 +#: menu.sh:1319 msgid "Call \\033[1;32mmenu.sh\\033[0m to return to menu" msgstr "执行 \\033[1;32mmenu.sh\\033[0m 重新进入设置菜单" diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh index 8cd119f8..1e0ef474 100755 --- a/files/board/arpl/overlayfs/opt/arpl/menu.sh +++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh @@ -545,11 +545,11 @@ function extractDsmFiles() { fi mkdir -p "${CACHE_PATH}/dl" - speed_a="`curl -Lo /dev/null -m 1 -skw "%{speed_download}" "https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS3622xs%2B_42218.pat"`" - speed_b="`curl -Lo /dev/null -m 1 -skw "%{speed_download}" "https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS3622xs%2B_42218.pat"`" - speed_c="`curl -Lo /dev/null -m 1 -skw "%{speed_download}" "https://cndl.synology.cn/download/DSM/release/7.0.1/42218/DSM_DS3622xs%2B_42218.pat"`" - fastest="`echo -e "global.synologydownload.com ${speed_a}\nglobal.download.synology.com ${speed_b}\ncndl.synology.cn ${speed_c}" | sort -k2rn | head -1 | awk '{print $1}'`" - + speed_a=`ping -c 1 -W 5 global.synologydownload.com | awk '/time=/ {print $7}' | cut -d '=' -f 2` + speed_b=`ping -c 1 -W 5 global.download.synology.com | awk '/time=/ {print $7}' | cut -d '=' -f 2` + speed_c=`ping -c 1 -W 5 cndl.synology.cn | awk '/time=/ {print $7}' | cut -d '=' -f 2` + fastest="`echo -e "global.synologydownload.com ${speed_a}\nglobal.download.synology.com ${speed_b}\ncndl.synology.cn ${speed_c}" | sort -k2n | head -1 | awk '{print $1}'`" + mirror="`echo ${PAT_URL} | sed 's|^http[s]*://\([^/]*\).*|\1|'`" if [ "${mirror}" != "${fastest}" ]; then echo "`printf "$(TEXT "Based on the current network situation, switch to %s mirror to downloading.")" "${fastest}"`" @@ -756,7 +756,9 @@ function advancedMenu() { echo "u \"$(TEXT "Edit user config file manually")\"" >> "${TMP_PATH}/menu" echo "t \"$(TEXT "Try to recovery a DSM installed system")\"" >> "${TMP_PATH}/menu" echo "s \"$(TEXT "Show SATA(s) # ports and drives")\"" >> "${TMP_PATH}/menu" + echo "f \"$(TEXT "Format disk(s) # SATA and NVME")\"" >> "${TMP_PATH}/menu" echo "d \"$(TEXT "Custom dts location:/mnt/p1/model.dts # Need rebuild")\"" >> "${TMP_PATH}/menu" + echo "p \"$(TEXT "Persistence of arpl modifications")\"" >> "${TMP_PATH}/menu" echo "e \"$(TEXT "Exit")\"" >> "${TMP_PATH}/menu" dialog --default-item ${NEXT} --backtitle "`backtitle`" --title "$(TEXT "Advanced")" \ @@ -811,6 +813,47 @@ function advancedMenu() { dialog --backtitle "`backtitle`" --colors --aspect 18 \ --msgbox "${MSG}" 0 0 ;; + f) ITEMS="" + while read POSITION NAME; do + [ -z "${POSITION}" -o -z "${NAME}" ] && continue + ITEMS+="`printf "%s %s off " "${POSITION}" "${NAME}"`" + done < <(ls -l /dev/disk/by-id/ | grep -v "${LOADER_DEVICE_NAME}" | sed 's|../..|/dev|g' | awk -F' ' '{print $11" "$9}' | sort -uk 1,1) + dialog --backtitle "`backtitle`" --title "$(TEXT "Format disk")" \ + --checklist "$(TEXT "Advanced")" 0 0 0 ${ITEMS} 2>${TMP_PATH}/resp + [ $? -ne 0 ] && return + RESP=`<"${TMP_PATH}/resp"` + [ -z "${RESP}" ] && return + dialog --backtitle "`backtitle`" --title "$(TEXT "Format disk")" \ + --yesno "$(TEXT "Warning:\nThis operation is irreversible. Please backup important data. Do you want to continue?")" 0 0 + [ $? -ne 0 ] && return + ( + for I in ${RESP}; do + mkfs.ext4 -F -O ^metadata_csum ${I} + done + ) | dialog --backtitle "`backtitle`" --title "$(TEXT "Format disk")" \ + --progressbox "$(TEXT "Formatting ...")" 20 70 + MSG="$(TEXT "Formatting is complete.")" + dialog --backtitle "`backtitle`" --colors --aspect 18 \ + --msgbox "${MSG}" 0 0 + ;; + p) + dialog --backtitle "`backtitle`" --title "$(TEXT "Persistence of arpl modifications")" \ + --yesno "$(TEXT "Warning:\nDo not terminate midway, otherwise it may cause damage to the arpl. Do you want to continue?")" 0 0 + [ $? -ne 0 ] && return + ( + RDXZ_PATH=/tmp/rdxz_tmp + mkdir -p "${RDXZ_PATH}" + (cd "${RDXZ_PATH}"; xz -dc < "/mnt/p3/initrd-arpl" | cpio -idm) >/dev/null 2>&1 || true + rm -rf "${RDXZ_PATH}/opt/arpl" + cp -rf "/opt/arpl" "${RDXZ_PATH}/opt" + (cd "${RDXZ_PATH}"; find . 2>/dev/null | cpio -o -H newc -R root:root | xz --check=crc32 > "/mnt/p3/initrd-arpl") || true + rm -rf "${RDXZ_PATH}" + ) | dialog --backtitle "`backtitle`" --title "$(TEXT "Persistence of arpl modifications")" \ + --progressbox "$(TEXT "Persisting ...")" 20 70 + MSG="$(TEXT "Persisting is complete.")" + dialog --backtitle "`backtitle`" --colors --aspect 18 \ + --msgbox "${MSG}" 0 0 + ;; e) break ;; esac done