diff --git a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh index 7064ded9..2a93b352 100644 --- a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh +++ b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh @@ -21,6 +21,7 @@ MOD_RDGZ_FILE="${CACHE_PATH}/initrd-dsm" ADDONS_PATH="${CACHE_PATH}/addons" LKM_PATH="${CACHE_PATH}/lkms" MODULES_PATH="${CACHE_PATH}/modules" +USER_UP_PATH="${CACHE_PATH}/users" MODEL_CONFIG_PATH="/opt/arpl/model-configs" INCLUDE_PATH="/opt/arpl/include" diff --git a/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot b/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot index c94844ec..daaa4c0f 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-05 19:39+0800\n" +"POT-Creation-Date: 2023-05-07 05:18+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,11 +34,11 @@ msgid "DSM zImage changed" msgstr "" #: boot.sh:27 boot.sh:39 menu.sh:589 menu.sh:615 menu.sh:684 menu.sh:695 -#: menu.sh:724 menu.sh:735 menu.sh:742 +#: menu.sh:724 menu.sh:737 menu.sh:744 msgid "Error" msgstr "" -#: boot.sh:28 menu.sh:736 +#: boot.sh:28 menu.sh:738 msgid "zImage not patched:\\n" msgstr "" @@ -46,7 +46,7 @@ msgstr "" msgid "DSM Ramdisk changed" msgstr "" -#: boot.sh:40 menu.sh:743 +#: boot.sh:40 menu.sh:745 msgid "Ramdisk not patched:\\n" msgstr "" @@ -205,7 +205,7 @@ msgstr "" msgid "Reconfiguring Synoinfo, Addons and Modules" msgstr "" -#: menu.sh:189 menu.sh:238 menu.sh:357 menu.sh:470 menu.sh:971 menu.sh:1117 +#: menu.sh:189 menu.sh:238 menu.sh:357 menu.sh:470 menu.sh:1018 menu.sh:1164 msgid "Choose a option" msgstr "" @@ -221,7 +221,7 @@ msgstr "" msgid "Please enter a serial number " msgstr "" -#: menu.sh:208 menu.sh:427 menu.sh:1064 menu.sh:1341 +#: menu.sh:208 menu.sh:427 menu.sh:1111 menu.sh:1388 msgid "Alert" msgstr "" @@ -249,8 +249,8 @@ msgstr "" msgid "Download a external addon" msgstr "" -#: menu.sh:244 menu.sh:354 menu.sh:466 menu.sh:781 menu.sh:976 menu.sh:1123 -#: menu.sh:1390 +#: menu.sh:244 menu.sh:354 menu.sh:466 menu.sh:784 menu.sh:1023 menu.sh:1170 +#: menu.sh:1437 msgid "Exit" msgstr "" @@ -514,381 +514,419 @@ msgstr "" msgid "Addon %s not found!" msgstr "" -#: menu.sh:747 menu.sh:1408 +#: menu.sh:749 menu.sh:1455 msgid "Cleaning" msgstr "" -#: menu.sh:750 +#: menu.sh:752 msgid "Ready!" msgstr "" -#: menu.sh:763 -msgid "Switch LKM version:" +#: menu.sh:765 menu.sh:1008 menu.sh:1034 menu.sh:1045 menu.sh:1058 menu.sh:1064 +msgid "Modules" msgstr "" -#: menu.sh:764 menu.sh:961 menu.sh:987 menu.sh:998 menu.sh:1011 menu.sh:1017 -msgid "Modules" +#: menu.sh:766 +msgid "Switch LKM version:" msgstr "" -#: menu.sh:767 +#: menu.sh:769 msgid "Switch direct boot:" msgstr "" -#: menu.sh:769 +#: menu.sh:771 msgid "Edit user config file manually" msgstr "" -#: menu.sh:770 +#: menu.sh:772 msgid "Try to recovery a DSM installed system" msgstr "" -#: menu.sh:771 +#: menu.sh:773 msgid "Show SATA(s) # ports and drives" msgstr "" -#: menu.sh:772 -msgid "Format disk(s) # Without loader disk" +#: menu.sh:775 +msgid "show pat download link" msgstr "" -#: menu.sh:773 menu.sh:863 menu.sh:876 +#: menu.sh:777 menu.sh:851 menu.sh:864 msgid "Allow downgrade installation" msgstr "" -#: menu.sh:775 -msgid "Custom dts location:/mnt/p1/model.dts # Need rebuild" +#: menu.sh:778 +msgid "Format disk(s) # Without loader disk" msgstr "" -#: menu.sh:777 menu.sh:883 menu.sh:894 +#: menu.sh:779 menu.sh:893 menu.sh:896 msgid "Persistence of arpl modifications" msgstr "" -#: menu.sh:779 -msgid "show pat download link" +#: menu.sh:781 +msgid "Custom dts file # Need rebuild" +msgstr "" + +#: menu.sh:783 +msgid "Backup bootloader disk # dd" msgstr "" -#: menu.sh:783 menu.sh:841 +#: menu.sh:786 menu.sh:876 msgid "Advanced" msgstr "" -#: menu.sh:784 menu.sh:1393 +#: menu.sh:787 menu.sh:1440 msgid "Choose the option" msgstr "" -#: menu.sh:828 +#: menu.sh:831 msgid "\\nTotal of ports: %s\\n" msgstr "" -#: menu.sh:829 +#: menu.sh:832 msgid "" "\\nPorts with color \\Z1red\\Zn as DUMMY, color \\Z2\\Zbgreen\\Zn has drive " "connected." msgstr "" -#: menu.sh:830 +#: menu.sh:833 msgid "\\nRecommended value:" msgstr "" -#: menu.sh:831 +#: menu.sh:834 msgid "\\nDiskIdxMap:" msgstr "" -#: menu.sh:840 menu.sh:845 menu.sh:852 -msgid "Format disk" +#: menu.sh:843 +msgid "*.pat download link" msgstr "" -#: menu.sh:846 menu.sh:862 +#: menu.sh:848 +msgid "" +"This feature will allow you to downgrade the installation by removing the " +"VERSION file from the first partition of all disks.\\n" +msgstr "" + +#: menu.sh:849 +msgid "Therefore, please insert all disks before continuing.\\n" +msgstr "" + +#: menu.sh:850 menu.sh:881 msgid "" "Warning:\\nThis operation is irreversible. Please backup important data. Do " "you want to continue?" msgstr "" -#: menu.sh:853 +#: menu.sh:865 +msgid "Removing ..." +msgstr "" + +#: menu.sh:866 +msgid "Remove VERSION file for all disks completed." +msgstr "" + +#: menu.sh:875 menu.sh:880 menu.sh:887 +msgid "Format disk" +msgstr "" + +#: menu.sh:888 msgid "Formatting ..." msgstr "" -#: menu.sh:854 +#: menu.sh:890 msgid "Formatting is complete." msgstr "" -#: menu.sh:860 +#: menu.sh:894 menu.sh:945 msgid "" -"This feature will allow you to downgrade the installation by removing the " -"VERSION file from the first partition of all disks.\\n" +"Warning:\\nDo not terminate midway, otherwise it may cause damage to the " +"arpl. Do you want to continue?" msgstr "" -#: menu.sh:861 -msgid "Therefore, please insert all disks before continuing.\\n" +#: menu.sh:897 +msgid "Persisting ..." msgstr "" -#: menu.sh:877 -msgid "Removing ..." +#: menu.sh:906 +msgid "Persisting is complete." msgstr "" -#: menu.sh:878 -msgid "Remove VERSION file for all disks completed." +#: menu.sh:911 menu.sh:941 +msgid "This feature is only available when accessed via web/ssh." msgstr "" -#: menu.sh:884 +#: menu.sh:915 msgid "" -"Warning:\\nDo not terminate midway, otherwise it may cause damage to the " -"arpl. Do you want to continue?" +"Currently, only dts format files are supported. Please prepare and click to " +"confirm uploading.\\n(saved in /mnt/p3/users/)" msgstr "" -#: menu.sh:895 -msgid "Persisting ..." +#: menu.sh:929 menu.sh:934 +msgid "Custom dts file" msgstr "" -#: menu.sh:896 -msgid "Persisting is complete." +#: menu.sh:930 +msgid "Not a valid dts file, please try again!" msgstr "" -#: menu.sh:905 -msgid "*.pat download link" +#: menu.sh:935 +msgid "A valid dts file, Automatically import at compile time." +msgstr "" + +#: menu.sh:944 menu.sh:947 +msgid "Backup bootloader disk" +msgstr "" + +#: menu.sh:948 +msgid "Backuping..." msgstr "" -#: menu.sh:916 menu.sh:944 menu.sh:951 +#: menu.sh:953 +msgid "backup is complete." +msgstr "" + +#: menu.sh:963 menu.sh:991 menu.sh:998 msgid "Try recovery DSM" msgstr "" -#: menu.sh:917 +#: menu.sh:964 msgid "Trying to recovery a DSM installed system" msgstr "" -#: menu.sh:938 +#: menu.sh:985 msgid "Found a installation:\\nModel: %s\\nBuildnumber: %s" msgstr "" -#: menu.sh:942 +#: menu.sh:989 msgid "\\nSerial: %s" msgstr "" -#: menu.sh:952 +#: menu.sh:999 msgid "Unfortunately I couldn't mount the DSM partition!" msgstr "" -#: menu.sh:962 +#: menu.sh:1009 msgid "Reading modules" msgstr "" -#: menu.sh:972 +#: menu.sh:1019 msgid "Show selected modules" msgstr "" -#: menu.sh:973 +#: menu.sh:1020 msgid "Select all modules" msgstr "" -#: menu.sh:974 +#: menu.sh:1021 msgid "Deselect all modules" msgstr "" -#: menu.sh:975 +#: menu.sh:1022 msgid "Choose modules to include" msgstr "" -#: menu.sh:984 +#: menu.sh:1031 msgid "User modules" msgstr "" -#: menu.sh:988 +#: menu.sh:1035 msgid "Selecting all modules" msgstr "" -#: menu.sh:999 +#: menu.sh:1046 msgid "Deselecting all modules" msgstr "" -#: menu.sh:1012 +#: menu.sh:1059 msgid "Select modules to include" msgstr "" -#: menu.sh:1018 +#: menu.sh:1065 msgid "Writing to user config" msgstr "" -#: menu.sh:1039 +#: menu.sh:1086 msgid "Edit with caution" msgstr "" -#: menu.sh:1045 +#: menu.sh:1092 msgid "Invalid YAML format" msgstr "" -#: menu.sh:1065 +#: menu.sh:1112 msgid "Config changed, would you like to rebuild the loader?" msgstr "" -#: menu.sh:1077 menu.sh:1384 +#: menu.sh:1124 menu.sh:1431 msgid "Choose a language" msgstr "" -#: menu.sh:1090 +#: menu.sh:1137 msgid "Choose a layout" msgstr "" -#: menu.sh:1100 +#: menu.sh:1147 msgid "Choice a keymap" msgstr "" -#: menu.sh:1118 menu.sh:1128 menu.sh:1136 menu.sh:1142 menu.sh:1146 -#: menu.sh:1151 menu.sh:1157 menu.sh:1164 menu.sh:1173 menu.sh:1178 -#: menu.sh:1195 +#: menu.sh:1165 menu.sh:1175 menu.sh:1183 menu.sh:1189 menu.sh:1193 +#: menu.sh:1198 menu.sh:1204 menu.sh:1211 menu.sh:1220 menu.sh:1225 +#: menu.sh:1242 msgid "Update arpl" msgstr "" -#: menu.sh:1119 menu.sh:1203 menu.sh:1211 menu.sh:1217 menu.sh:1221 -#: menu.sh:1225 menu.sh:1229 menu.sh:1234 menu.sh:1245 +#: menu.sh:1166 menu.sh:1250 menu.sh:1258 menu.sh:1264 menu.sh:1268 +#: menu.sh:1272 menu.sh:1276 menu.sh:1281 menu.sh:1292 msgid "Update addons" msgstr "" -#: menu.sh:1120 menu.sh:1250 menu.sh:1258 menu.sh:1264 menu.sh:1268 -#: menu.sh:1272 menu.sh:1287 +#: menu.sh:1167 menu.sh:1297 menu.sh:1305 menu.sh:1311 menu.sh:1315 +#: menu.sh:1319 menu.sh:1334 msgid "Update modules" msgstr "" -#: menu.sh:1121 menu.sh:1292 menu.sh:1300 menu.sh:1306 menu.sh:1310 -#: menu.sh:1314 menu.sh:1318 menu.sh:1323 +#: menu.sh:1168 menu.sh:1339 menu.sh:1347 menu.sh:1353 menu.sh:1357 +#: menu.sh:1361 menu.sh:1365 menu.sh:1370 msgid "Update LKMs" msgstr "" -#: menu.sh:1122 +#: menu.sh:1169 msgid "Set proxy server" msgstr "" -#: menu.sh:1129 menu.sh:1204 menu.sh:1251 menu.sh:1293 +#: menu.sh:1176 menu.sh:1251 menu.sh:1298 menu.sh:1340 msgid "Checking last version" msgstr "" -#: menu.sh:1137 menu.sh:1212 menu.sh:1259 menu.sh:1301 +#: menu.sh:1184 menu.sh:1259 menu.sh:1306 menu.sh:1348 msgid "Error checking new version" msgstr "" -#: menu.sh:1143 menu.sh:1218 menu.sh:1265 menu.sh:1307 +#: menu.sh:1190 menu.sh:1265 menu.sh:1312 menu.sh:1354 msgid "No new version. Actual version is %s\\nForce update?" msgstr "" -#: menu.sh:1147 +#: menu.sh:1194 msgid "Downloading last version %s" msgstr "" -#: menu.sh:1152 +#: menu.sh:1199 msgid "Error downloading update file" msgstr "" -#: menu.sh:1158 +#: menu.sh:1205 msgid "Error extracting update file" msgstr "" -#: menu.sh:1165 +#: menu.sh:1212 msgid "Checksum do not match!" msgstr "" -#: menu.sh:1174 +#: menu.sh:1221 msgid "" "The current version does not support upgrading to the latest update.zip. " "Please remake the bootloader disk!" msgstr "" -#: menu.sh:1179 +#: menu.sh:1226 msgid "Installing new files" msgstr "" -#: menu.sh:1196 +#: menu.sh:1243 msgid "Arpl updated with success to %s!\\nReboot?" msgstr "" -#: menu.sh:1222 menu.sh:1269 menu.sh:1311 +#: menu.sh:1269 menu.sh:1316 menu.sh:1358 msgid "Downloading last version" msgstr "" -#: menu.sh:1226 +#: menu.sh:1273 msgid "Error downloading new version" msgstr "" -#: menu.sh:1230 menu.sh:1319 +#: menu.sh:1277 menu.sh:1366 msgid "Extracting last version" msgstr "" -#: menu.sh:1235 +#: menu.sh:1282 msgid "Installing new addons" msgstr "" -#: menu.sh:1246 +#: menu.sh:1293 msgid "Addons updated with success!" msgstr "" -#: menu.sh:1273 menu.sh:1315 +#: menu.sh:1320 menu.sh:1362 msgid "Error downloading last version" msgstr "" -#: menu.sh:1288 +#: menu.sh:1335 msgid "Modules updated with success!" msgstr "" -#: menu.sh:1324 +#: menu.sh:1371 msgid "LKMs updated with success!" msgstr "" -#: menu.sh:1330 +#: menu.sh:1377 msgid "Set Proxy Server" msgstr "" -#: menu.sh:1331 +#: menu.sh:1378 msgid "Please enter a proxy server url" msgstr "" -#: menu.sh:1342 +#: menu.sh:1389 msgid "Invalid proxy server url, continue?" msgstr "" -#: menu.sh:1365 +#: menu.sh:1412 msgid "Choose a model" msgstr "" -#: menu.sh:1367 +#: menu.sh:1414 msgid "Choose a Build Number" msgstr "" -#: menu.sh:1368 +#: menu.sh:1415 msgid "Choose a serial number" msgstr "" -#: menu.sh:1370 +#: menu.sh:1417 msgid "Addons" msgstr "" -#: menu.sh:1371 +#: menu.sh:1418 msgid "Cmdline menu" msgstr "" -#: menu.sh:1372 +#: menu.sh:1419 msgid "Synoinfo menu" msgstr "" -#: menu.sh:1375 +#: menu.sh:1422 msgid "Advanced menu" msgstr "" -#: menu.sh:1378 +#: menu.sh:1425 msgid "Build the loader" msgstr "" -#: menu.sh:1382 +#: menu.sh:1429 msgid "Boot the loader" msgstr "" -#: menu.sh:1385 +#: menu.sh:1432 msgid "Choose a keymap" msgstr "" -#: menu.sh:1387 +#: menu.sh:1434 msgid "Clean disk cache" msgstr "" -#: menu.sh:1389 +#: menu.sh:1436 msgid "Update menu" msgstr "" -#: menu.sh:1415 +#: menu.sh:1462 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 421405e1..0d9e5a7c 100644 Binary files a/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.mo and b/files/board/arpl/overlayfs/opt/arpl/lang/zh_CN.mo differ 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 05d9226a..1b041e7f 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-05 19:39+0800\n" -"PO-Revision-Date: 2023-05-05 19:39+0800\n" +"POT-Creation-Date: 2023-05-07 05:06+0800\n" +"PO-Revision-Date: 2023-05-07 05:06+0800\n" "Last-Translator: ing \n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" @@ -33,11 +33,11 @@ msgid "DSM zImage changed" msgstr "DSM zImage 已更改" #: boot.sh:27 boot.sh:39 menu.sh:589 menu.sh:615 menu.sh:684 menu.sh:695 -#: menu.sh:724 menu.sh:735 menu.sh:742 +#: menu.sh:724 menu.sh:737 menu.sh:744 msgid "Error" msgstr "错误" -#: boot.sh:28 menu.sh:736 +#: boot.sh:28 menu.sh:738 msgid "zImage not patched:\\n" msgstr "zImage打补丁失败:\\n" @@ -45,7 +45,7 @@ msgstr "zImage打补丁失败:\\n" msgid "DSM Ramdisk changed" msgstr "DSM Ramdisk 已更改" -#: boot.sh:40 menu.sh:743 +#: boot.sh:40 menu.sh:745 msgid "Ramdisk not patched:\\n" msgstr "Ramdisk打补丁失败:\\n" @@ -204,7 +204,7 @@ msgstr "该版本不支持UEFI启动, 请选择其他版本或者切换启动模 msgid "Reconfiguring Synoinfo, Addons and Modules" msgstr "重新配置 Syninfo, 插件和模块" -#: menu.sh:189 menu.sh:238 menu.sh:357 menu.sh:470 menu.sh:971 menu.sh:1117 +#: menu.sh:189 menu.sh:238 menu.sh:357 menu.sh:470 menu.sh:1018 menu.sh:1164 msgid "Choose a option" msgstr "设置" @@ -220,7 +220,7 @@ msgstr "输入SN" msgid "Please enter a serial number " msgstr "请输入SN " -#: menu.sh:208 menu.sh:427 menu.sh:1064 menu.sh:1341 +#: menu.sh:208 menu.sh:427 menu.sh:1111 menu.sh:1388 msgid "Alert" msgstr "警告" @@ -248,8 +248,8 @@ msgstr "显示所有可用插件" msgid "Download a external addon" msgstr "下载外部插件" -#: menu.sh:244 menu.sh:354 menu.sh:466 menu.sh:781 menu.sh:976 menu.sh:1123 -#: menu.sh:1390 +#: menu.sh:244 menu.sh:354 menu.sh:466 menu.sh:784 menu.sh:1023 menu.sh:1170 +#: menu.sh:1437 msgid "Exit" msgstr "退出" @@ -513,381 +513,419 @@ msgstr "拷贝文件: " msgid "Addon %s not found!" msgstr "插件 %s 未找到!" -#: menu.sh:747 menu.sh:1408 +#: menu.sh:749 menu.sh:1455 msgid "Cleaning" msgstr "清除中" -#: menu.sh:750 +#: menu.sh:752 msgid "Ready!" msgstr "已就绪!" -#: menu.sh:763 -msgid "Switch LKM version:" -msgstr "选择LKM版本:" - -#: menu.sh:764 menu.sh:961 menu.sh:987 menu.sh:998 menu.sh:1011 menu.sh:1017 +#: menu.sh:765 menu.sh:1008 menu.sh:1034 menu.sh:1045 menu.sh:1058 menu.sh:1064 msgid "Modules" msgstr "模块" -#: menu.sh:767 +#: menu.sh:766 +msgid "Switch LKM version:" +msgstr "选择LKM版本:" + +#: menu.sh:769 msgid "Switch direct boot:" msgstr "切换直接启动:" -#: menu.sh:769 +#: menu.sh:771 msgid "Edit user config file manually" msgstr "编辑用户配置文件" -#: menu.sh:770 +#: menu.sh:772 msgid "Try to recovery a DSM installed system" msgstr "尝试恢复已安装DSM的系统" -#: menu.sh:771 +#: menu.sh:773 msgid "Show SATA(s) # ports and drives" msgstr "显示SATA(s) # 端口和驱动器" -#: menu.sh:772 -msgid "Format disk(s) # Without loader disk" -msgstr "格式化磁盘(s) # 不含启动盘" +#: menu.sh:775 +msgid "show pat download link" +msgstr "当前pat下载链接" -#: menu.sh:773 menu.sh:863 menu.sh:876 +#: menu.sh:777 menu.sh:851 menu.sh:864 msgid "Allow downgrade installation" msgstr "允许降级安装" -#: menu.sh:775 -msgid "Custom dts location:/mnt/p1/model.dts # Need rebuild" -msgstr "自定义 dts 文件位置:/mnt/p1/model.dts # 需要重新编译" +#: menu.sh:778 +msgid "Format disk(s) # Without loader disk" +msgstr "格式化磁盘(s) # 不含启动盘" -#: menu.sh:777 menu.sh:883 menu.sh:894 +#: menu.sh:779 menu.sh:893 menu.sh:896 msgid "Persistence of arpl modifications" msgstr "持久化arpl的修改" -#: menu.sh:779 -msgid "show pat download link" -msgstr "当前pat下载链接" +#: menu.sh:781 +msgid "Custom dts file # Need rebuild" +msgstr "自定义 dts 文件 # 需要重新编译" + +#: menu.sh:783 +msgid "Backup bootloader disk # dd" +msgstr "备份启动盘" -#: menu.sh:783 menu.sh:841 +#: menu.sh:786 menu.sh:876 msgid "Advanced" msgstr "高级" -#: menu.sh:784 menu.sh:1393 +#: menu.sh:787 menu.sh:1440 msgid "Choose the option" msgstr "设置" -#: menu.sh:828 +#: menu.sh:831 msgid "\\nTotal of ports: %s\\n" msgstr "\\n端口总数: %s\\n" -#: menu.sh:829 +#: menu.sh:832 msgid "" "\\nPorts with color \\Z1red\\Zn as DUMMY, color \\Z2\\Zbgreen\\Zn has drive " "connected." msgstr "\\n\\Z1红色\\Zn 为模拟端口, \\Z2\\Zb绿色\\Zn 为已驱动的物理端口." -#: menu.sh:830 +#: menu.sh:833 msgid "\\nRecommended value:" msgstr "\\n建议值:" -#: menu.sh:831 +#: menu.sh:834 msgid "\\nDiskIdxMap:" msgstr "\\nDiskIdxMap:" -#: menu.sh:840 menu.sh:845 menu.sh:852 -msgid "Format disk" -msgstr "格式化磁盘" - -#: menu.sh:846 menu.sh:862 -msgid "" -"Warning:\\nThis operation is irreversible. Please backup important data. Do " -"you want to continue?" -msgstr "警告:\\n该操作不可逆, 请提前备份重要数据. 是否继续?" - -#: menu.sh:853 -msgid "Formatting ..." -msgstr "格式化中..." - -#: menu.sh:854 -msgid "Formatting is complete." -msgstr "格式化完成." +#: menu.sh:843 +msgid "*.pat download link" +msgstr "*.pat 下载链接" -#: menu.sh:860 +#: menu.sh:848 msgid "" "This feature will allow you to downgrade the installation by removing the " "VERSION file from the first partition of all disks.\\n" msgstr "此功能通过删除所有磁盘的第一个分区的VERSION文件来允许你降级安装.\\n" -#: menu.sh:861 +#: menu.sh:849 msgid "Therefore, please insert all disks before continuing.\\n" msgstr "因此, 请插入所有磁盘后再进行操作.\\n" -#: menu.sh:877 +#: menu.sh:850 menu.sh:881 +msgid "" +"Warning:\\nThis operation is irreversible. Please backup important data. Do " +"you want to continue?" +msgstr "警告:\\n该操作不可逆, 请提前备份重要数据. 是否继续?" + +#: menu.sh:865 msgid "Removing ..." msgstr "删除中..." -#: menu.sh:878 +#: menu.sh:866 msgid "Remove VERSION file for all disks completed." msgstr "已移除所有磁盘的 VERSION 文件." -#: menu.sh:884 +#: menu.sh:875 menu.sh:880 menu.sh:887 +msgid "Format disk" +msgstr "格式化磁盘" + +#: menu.sh:888 +msgid "Formatting ..." +msgstr "格式化中..." + +#: menu.sh:890 +msgid "Formatting is complete." +msgstr "格式化完成." + +#: menu.sh:894 menu.sh:945 msgid "" "Warning:\\nDo not terminate midway, otherwise it may cause damage to the " "arpl. Do you want to continue?" msgstr "警告:\\n请不要中途停止, 否则将导致arpl引导损毁, 是否继续?" -#: menu.sh:895 +#: menu.sh:897 msgid "Persisting ..." msgstr "持久化中..." -#: menu.sh:896 +#: menu.sh:906 msgid "Persisting is complete." msgstr "持久化完成." -#: menu.sh:905 -msgid "*.pat download link" -msgstr "pat下载链接" +#: menu.sh:911 menu.sh:941 +msgid "This feature is only available when accessed via web/ssh." +msgstr "此功能仅通过web/ssh访问时可用." + +#: menu.sh:915 +msgid "" +"Currently, only dts format files are supported. Please prepare and click to " +"confirm uploading.\\n(saved in /mnt/p3/users/)" +msgstr "目前, 只支持dts格式的文件, 请准备并点击确认上传.\\n(保存于 /mnt/p3/users/ 中)" + +#: menu.sh:929 menu.sh:934 +msgid "Custom dts file" +msgstr "自定义 dts 文件" + +#: menu.sh:930 +msgid "Not a valid dts file, please try again!" +msgstr "dts 文件无效, 请重试!" + +#: menu.sh:935 +msgid "A valid dts file, Automatically import at compile time." +msgstr "dts 文件有效, 将在编译时自动导入." -#: menu.sh:916 menu.sh:944 menu.sh:951 +#: menu.sh:944 menu.sh:947 +msgid "Backup bootloader disk" +msgstr "备份启动盘" + +#: menu.sh:948 +msgid "Backuping..." +msgstr "备份中..." + +#: menu.sh:953 +msgid "backup is complete." +msgstr "备份完成." + +#: menu.sh:963 menu.sh:991 menu.sh:998 msgid "Try recovery DSM" msgstr "尝试恢复DSM系统" -#: menu.sh:917 +#: menu.sh:964 msgid "Trying to recovery a DSM installed system" msgstr "尝试恢复已安装的DSM系统中" -#: menu.sh:938 +#: menu.sh:985 msgid "Found a installation:\\nModel: %s\\nBuildnumber: %s" msgstr "找到已安装:\\n型号: %s\\n版本: %s" -#: menu.sh:942 +#: menu.sh:989 msgid "\\nSerial: %s" msgstr "\\nSN: %s" -#: menu.sh:952 +#: menu.sh:999 msgid "Unfortunately I couldn't mount the DSM partition!" msgstr "很遗憾, 我无法挂载DSM分区!" -#: menu.sh:962 +#: menu.sh:1009 msgid "Reading modules" msgstr "读取模块中" -#: menu.sh:972 +#: menu.sh:1019 msgid "Show selected modules" msgstr "显示已加载的模块" -#: menu.sh:973 +#: menu.sh:1020 msgid "Select all modules" msgstr "选择所有模块" -#: menu.sh:974 +#: menu.sh:1021 msgid "Deselect all modules" msgstr "取消所有模块" -#: menu.sh:975 +#: menu.sh:1022 msgid "Choose modules to include" msgstr "选择要加载的模块" -#: menu.sh:984 +#: menu.sh:1031 msgid "User modules" msgstr "模块" -#: menu.sh:988 +#: menu.sh:1035 msgid "Selecting all modules" msgstr "全选所有模块" -#: menu.sh:999 +#: menu.sh:1046 msgid "Deselecting all modules" msgstr "取消所有模块" -#: menu.sh:1012 +#: menu.sh:1059 msgid "Select modules to include" msgstr "选择要加载的插件" -#: menu.sh:1018 +#: menu.sh:1065 msgid "Writing to user config" msgstr "写入用户配置" -#: menu.sh:1039 +#: menu.sh:1086 msgid "Edit with caution" msgstr "请谨慎编辑" -#: menu.sh:1045 +#: menu.sh:1092 msgid "Invalid YAML format" msgstr "无效的YAML格式" -#: menu.sh:1065 +#: menu.sh:1112 msgid "Config changed, would you like to rebuild the loader?" msgstr "配置已更改, 是否重新编译引导?" -#: menu.sh:1077 menu.sh:1384 +#: menu.sh:1124 menu.sh:1431 msgid "Choose a language" msgstr "选择语言" -#: menu.sh:1090 +#: menu.sh:1137 msgid "Choose a layout" msgstr "选择布局" -#: menu.sh:1100 +#: menu.sh:1147 msgid "Choice a keymap" msgstr "选择键盘" -#: menu.sh:1118 menu.sh:1128 menu.sh:1136 menu.sh:1142 menu.sh:1146 -#: menu.sh:1151 menu.sh:1157 menu.sh:1164 menu.sh:1173 menu.sh:1178 -#: menu.sh:1195 +#: menu.sh:1165 menu.sh:1175 menu.sh:1183 menu.sh:1189 menu.sh:1193 +#: menu.sh:1198 menu.sh:1204 menu.sh:1211 menu.sh:1220 menu.sh:1225 +#: menu.sh:1242 msgid "Update arpl" msgstr "更新arpl" -#: menu.sh:1119 menu.sh:1203 menu.sh:1211 menu.sh:1217 menu.sh:1221 -#: menu.sh:1225 menu.sh:1229 menu.sh:1234 menu.sh:1245 +#: menu.sh:1166 menu.sh:1250 menu.sh:1258 menu.sh:1264 menu.sh:1268 +#: menu.sh:1272 menu.sh:1276 menu.sh:1281 menu.sh:1292 msgid "Update addons" msgstr "更新插件" -#: menu.sh:1120 menu.sh:1250 menu.sh:1258 menu.sh:1264 menu.sh:1268 -#: menu.sh:1272 menu.sh:1287 +#: menu.sh:1167 menu.sh:1297 menu.sh:1305 menu.sh:1311 menu.sh:1315 +#: menu.sh:1319 menu.sh:1334 msgid "Update modules" msgstr "更新模块" -#: menu.sh:1121 menu.sh:1292 menu.sh:1300 menu.sh:1306 menu.sh:1310 -#: menu.sh:1314 menu.sh:1318 menu.sh:1323 +#: menu.sh:1168 menu.sh:1339 menu.sh:1347 menu.sh:1353 menu.sh:1357 +#: menu.sh:1361 menu.sh:1365 menu.sh:1370 msgid "Update LKMs" msgstr "更新LKMs" -#: menu.sh:1122 +#: menu.sh:1169 msgid "Set proxy server" msgstr "设置代理" -#: menu.sh:1129 menu.sh:1204 menu.sh:1251 menu.sh:1293 +#: menu.sh:1176 menu.sh:1251 menu.sh:1298 menu.sh:1340 msgid "Checking last version" msgstr "检测新版本中" -#: menu.sh:1137 menu.sh:1212 menu.sh:1259 menu.sh:1301 +#: menu.sh:1184 menu.sh:1259 menu.sh:1306 menu.sh:1348 msgid "Error checking new version" msgstr "检测新版本错误" -#: menu.sh:1143 menu.sh:1218 menu.sh:1265 menu.sh:1307 +#: menu.sh:1190 menu.sh:1265 menu.sh:1312 menu.sh:1354 msgid "No new version. Actual version is %s\\nForce update?" msgstr "没有新版本. 实际版本为 %s\\n强制更新?" -#: menu.sh:1147 +#: menu.sh:1194 msgid "Downloading last version %s" msgstr "下载新版本 %s 中" -#: menu.sh:1152 +#: menu.sh:1199 msgid "Error downloading update file" msgstr "下载新版本错误" -#: menu.sh:1158 +#: menu.sh:1205 msgid "Error extracting update file" msgstr "更新文件解压错误" -#: menu.sh:1165 +#: menu.sh:1212 msgid "Checksum do not match!" msgstr "Checksum不匹配!" -#: menu.sh:1174 +#: menu.sh:1221 msgid "" "The current version does not support upgrading to the latest update.zip. " "Please remake the bootloader disk!" msgstr "当前版本不支持最新的update.zip升级, 请重新制作引导盘!" -#: menu.sh:1179 +#: menu.sh:1226 msgid "Installing new files" msgstr "安装更新中" -#: menu.sh:1196 +#: menu.sh:1243 msgid "Arpl updated with success to %s!\\nReboot?" msgstr "Arpl更新成功 %s!\\n重启?" -#: menu.sh:1222 menu.sh:1269 menu.sh:1311 +#: menu.sh:1269 menu.sh:1316 menu.sh:1358 msgid "Downloading last version" msgstr "下载新版本中" -#: menu.sh:1226 +#: menu.sh:1273 msgid "Error downloading new version" msgstr "下载新版本错误" -#: menu.sh:1230 menu.sh:1319 +#: menu.sh:1277 menu.sh:1366 msgid "Extracting last version" msgstr "解压新版本" -#: menu.sh:1235 +#: menu.sh:1282 msgid "Installing new addons" msgstr "安装新插件中" -#: menu.sh:1246 +#: menu.sh:1293 msgid "Addons updated with success!" msgstr "插件更新成功!" -#: menu.sh:1273 menu.sh:1315 +#: menu.sh:1320 menu.sh:1362 msgid "Error downloading last version" msgstr "下载新版本错误" -#: menu.sh:1288 +#: menu.sh:1335 msgid "Modules updated with success!" msgstr "模块更新成功!" -#: menu.sh:1324 +#: menu.sh:1371 msgid "LKMs updated with success!" msgstr "LKMs更新成功!" -#: menu.sh:1330 +#: menu.sh:1377 msgid "Set Proxy Server" msgstr "设置代理" -#: menu.sh:1331 +#: menu.sh:1378 msgid "Please enter a proxy server url" msgstr "请输入代理服务器url" -#: menu.sh:1342 +#: menu.sh:1389 msgid "Invalid proxy server url, continue?" msgstr "无效的代理服务器url,是否继续?" -#: menu.sh:1365 +#: menu.sh:1412 msgid "Choose a model" msgstr "选择型号" -#: menu.sh:1367 +#: menu.sh:1414 msgid "Choose a Build Number" msgstr "选择版本" -#: menu.sh:1368 +#: menu.sh:1415 msgid "Choose a serial number" msgstr "选择SN" -#: menu.sh:1370 +#: menu.sh:1417 msgid "Addons" msgstr "插件" -#: menu.sh:1371 +#: menu.sh:1418 msgid "Cmdline menu" msgstr "设置Cmdline" -#: menu.sh:1372 +#: menu.sh:1419 msgid "Synoinfo menu" msgstr "设置Synoinfo" -#: menu.sh:1375 +#: menu.sh:1422 msgid "Advanced menu" msgstr "高级设置" -#: menu.sh:1378 +#: menu.sh:1425 msgid "Build the loader" msgstr "编译引导" -#: menu.sh:1382 +#: menu.sh:1429 msgid "Boot the loader" msgstr "启动" -#: menu.sh:1385 +#: menu.sh:1432 msgid "Choose a keymap" msgstr "选择键盘" -#: menu.sh:1387 +#: menu.sh:1434 msgid "Clean disk cache" msgstr "清除磁盘缓存" -#: menu.sh:1389 +#: menu.sh:1436 msgid "Update menu" msgstr "更新" -#: menu.sh:1415 +#: menu.sh:1462 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 5316f091..33b99333 100755 --- a/files/board/arpl/overlayfs/opt/arpl/menu.sh +++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh @@ -762,8 +762,8 @@ function advancedMenu() { while true; do rm "${TMP_PATH}/menu" if [ -n "${BUILD}" ]; then - echo "l \"$(TEXT "Switch LKM version:") \Z4${LKM}\Zn\"" >> "${TMP_PATH}/menu" echo "o \"$(TEXT "Modules")\"" >> "${TMP_PATH}/menu" + echo "l \"$(TEXT "Switch LKM version:") \Z4${LKM}\Zn\"" >> "${TMP_PATH}/menu" fi if loaderIsConfigured; then echo "r \"$(TEXT "Switch direct boot:") \Z4${DIRECTBOOT}\Zn\"" >> "${TMP_PATH}/menu" @@ -771,15 +771,16 @@ 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) # Without loader disk")\"" >> "${TMP_PATH}/menu" - echo "a \"$(TEXT "Allow downgrade installation")\"" >> "${TMP_PATH}/menu" - if [ -n "${MODEL}" -a "true" = "`readModelKey "${MODEL}" "dt"`" ]; then - echo "d \"$(TEXT "Custom dts location:/mnt/p1/model.dts # Need rebuild")\"" >> "${TMP_PATH}/menu" - fi - echo "p \"$(TEXT "Persistence of arpl modifications")\"" >> "${TMP_PATH}/menu" if [ -n "${MODEL}" -a -n "${BUILD}" ]; then echo "k \"$(TEXT "show pat download link")\"" >> "${TMP_PATH}/menu" fi + echo "a \"$(TEXT "Allow downgrade installation")\"" >> "${TMP_PATH}/menu" + echo "f \"$(TEXT "Format disk(s) # Without loader disk")\"" >> "${TMP_PATH}/menu" + echo "p \"$(TEXT "Persistence of arpl modifications")\"" >> "${TMP_PATH}/menu" + if [ -n "${MODEL}" -a "true" = "`readModelKey "${MODEL}" "dt"`" ]; then + echo "d \"$(TEXT "Custom dts file # Need rebuild")\"" >> "${TMP_PATH}/menu" + fi + echo "b \"$(TEXT "Backup bootloader disk # dd")\"" >> "${TMP_PATH}/menu" echo "e \"$(TEXT "Exit")\"" >> "${TMP_PATH}/menu" dialog --default-item ${NEXT} --backtitle "`backtitle`" --title "$(TEXT "Advanced")" \ @@ -787,15 +788,15 @@ function advancedMenu() { 2>${TMP_PATH}/resp [ $? -ne 0 ] && break case `<"${TMP_PATH}/resp"` in + o) selectModules; NEXT="e" ;; l) LKM=$([ "${LKM}" = "dev" ] && echo 'prod' || ([ "${LKM}" = "test" ] && echo 'dev' || echo 'test')) writeConfigKey "lkm" "${LKM}" "${USER_CONFIG_FILE}" DIRTY=1 - NEXT="o" + NEXT="l" ;; - o) selectModules; NEXT="r" ;; r) [ "${DIRECTBOOT}" = "false" ] && DIRECTBOOT='true' || DIRECTBOOT='false' writeConfigKey "directboot" "${DIRECTBOOT}" "${USER_CONFIG_FILE}" - NEXT="u" + NEXT="e" ;; u) editUserConfig; NEXT="e" ;; t) tryRecoveryDSM ;; @@ -834,28 +835,13 @@ 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 + k) + # output pat download link + if [ ! -f "${TMP_PATH}/patdownloadurl" ]; then + echo "`readModelKey "${MODEL}" "builds.${BUILD}.pat.url"`" > "${TMP_PATH}/patdownloadurl" + fi + dialog --backtitle "`backtitle`" --title "$(TEXT "*.pat download link")" \ + --editbox "${TMP_PATH}/patdownloadurl" 0 0 ;; a) MSG="" @@ -881,31 +867,90 @@ 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 + dialog --backtitle "`backtitle`" --colors --aspect 18 \ + --msgbox "$(TEXT "Formatting is complete.")" 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`" --title "$(TEXT "Persistence of arpl modifications")" \ + --infobox "$(TEXT "Persisting ...")" 0 0 + 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`" --colors --aspect 18 \ - --msgbox "${MSG}" 0 0 + --msgbox ""$(TEXT "Persisting is complete.")"" 0 0 ;; - k) - # output pat download link - if [ ! -f "${TMP_PATH}/patdownloadurl" ]; then - echo "`readModelKey "${MODEL}" "builds.${BUILD}.pat.url"`" > "${TMP_PATH}/patdownloadurl" + d) + if ! tty | grep -q "/dev/pts"; then + dialog --backtitle "`backtitle`" --colors --aspect 18 \ + --msgbox "$(TEXT "This feature is only available when accessed via web/ssh.")" 0 0 + return + fi + dialog --backtitle "`backtitle`" --colors --aspect 18 \ + --msgbox "$(TEXT "Currently, only dts format files are supported. Please prepare and click to confirm uploading.\n(saved in /mnt/p3/users/)")" 0 0 + TMP_PATH=/tmp/users + rm -rf ${TMP_PATH} + mkdir -p ${TMP_PATH} + pushd ${TMP_PATH} + rz -q + for F in `ls -A`; do + USER_FILE=${TMP_PATH}/${F} + dtc -q -I dts -O dtb ${F} > test.dtb + RET=$? + break + done + popd + if [ ${RET} -ne 0 -o -z "${USER_FILE}" ]; then + dialog --backtitle "`backtitle`" --title "$(TEXT "Custom dts file")" --aspect 18 \ + --msgbox "$(TEXT "Not a valid dts file, please try again!")" 0 0 + else + mkdir -p ${USER_UP_PATH} + cp -f ${USER_FILE} ${USER_UP_PATH}/${MODEL}.dts + dialog --backtitle "`backtitle`" --title "$(TEXT "Custom dts file")" --aspect 18 \ + --msgbox "$(TEXT "A valid dts file, Automatically import at compile time.")" 0 0 fi - dialog --backtitle "`backtitle`" --title "$(TEXT "*.pat download link")" \ - --editbox "${TMP_PATH}/patdownloadurl" 0 0 + ;; + b) + if ! tty | grep -q "/dev/pts"; then + dialog --backtitle "`backtitle`" --colors --aspect 18 \ + --msgbox "$(TEXT "This feature is only available when accessed via web/ssh.")" 0 0 + return + fi + dialog --backtitle "`backtitle`" --title "$(TEXT "Backup bootloader disk")" \ + --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 + dialog --backtitle "`backtitle`" --title "$(TEXT "Backup bootloader disk")" \ + --infobox "$(TEXT "Backuping...")" 0 0 + dd if="${LOADER_DISK}" | gzip > backup.img.gz + sz -q backup.img.gz + rm -f backup.img.gz + dialog --backtitle "`backtitle`" --colors --aspect 18 \ + --msgbox "$(TEXT "backup is complete.")" 0 0 ;; e) break ;; esac diff --git a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh index 469137ab..1b220a33 100755 --- a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh +++ b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh @@ -145,7 +145,7 @@ installAddon eudev echo "/addons/eudev.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog installAddon disks echo "/addons/disks.sh \${1} ${DT} ${UNIQUE}" >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog -[ -f "/mnt/p1/model.dts" ] && cp "/mnt/p1/model.dts" "${RAMDISK_PATH}/addons/model.dts" +[ -f "${USER_UP_PATH}/${MODEL}.dts" ] && cp "${USER_UP_PATH}/${MODEL}.dts" "${RAMDISK_PATH}/addons/model.dts" installAddon wol echo "/addons/wol.sh \${1} " >> "${RAMDISK_PATH}/addons/addons.sh" 2>"${LOG_FILE}" || dieLog # User addons diff --git a/scripts/func.sh b/scripts/func.sh index 8ffd0d0d..866cca67 100644 --- a/scripts/func.sh +++ b/scripts/func.sh @@ -33,7 +33,7 @@ function getExtractor(){ rm -rf "${CACHE_DIR}"; mkdir -p "${CACHE_DIR}" # Download pat file # global.synologydownload.com, global.download.synology.com, cndl.synology.cn - local PAT_URL="https://global.download.synology.com/download/DSM/release/7.0.1/42218/DSM_DS3622xs%2B_42218.pat" + local PAT_URL="https://global.synologydownload.com/download/DSM/release/7.0.1/42218/DSM_DS3622xs%2B_42218.pat" local PAT_FILE="DSM_DS3622xs+_42218.pat" local STATUS=`curl -# -w "%{http_code}" -L "${PAT_URL}" -o "${CACHE_DIR}/${PAT_FILE}"` if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then