From f18ba3e1a98cfe28339c11721f436213c4cd9f46 Mon Sep 17 00:00:00 2001 From: Ing Date: Sun, 9 Jul 2023 11:54:43 +0800 Subject: [PATCH] add poweroff/reboot --- .../arpl/overlayfs/opt/arpl/lang/arpl.pot | 110 ++++++++++------- .../arpl/overlayfs/opt/arpl/lang/zh_CN.mo | Bin 20623 -> 20860 bytes .../arpl/overlayfs/opt/arpl/lang/zh_CN.po | 112 +++++++++++------- files/board/arpl/overlayfs/opt/arpl/menu.sh | 33 +++++- .../arpl/overlayfs/opt/arpl/ramdisk-patch.sh | 21 ++-- .../arpl/overlayfs/var/www/data/index.html | 2 + 6 files changed, 175 insertions(+), 103 deletions(-) diff --git a/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot b/files/board/arpl/overlayfs/opt/arpl/lang/arpl.pot index d48d54c9..680d5183 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-07-07 17:21+0800\n" +"POT-Creation-Date: 2023-07-09 11:51+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -223,7 +223,7 @@ msgstr "" msgid "Choose the model" msgstr "" -#: menu.sh:154 menu.sh:1766 +#: menu.sh:154 menu.sh:1765 msgid "Choose a product version" msgstr "" @@ -251,7 +251,7 @@ msgstr "" msgid "Reconfiguring Synoinfo, Addons and Modules" msgstr "" -#: menu.sh:260 menu.sh:405 menu.sh:546 menu.sh:687 menu.sh:1634 +#: menu.sh:260 menu.sh:405 menu.sh:546 menu.sh:687 menu.sh:1633 msgid "Choose a option" msgstr "" @@ -275,14 +275,14 @@ msgstr "" msgid "Upload a external addon" msgstr "" -#: menu.sh:266 menu.sh:412 menu.sh:542 menu.sh:682 menu.sh:995 menu.sh:1641 -#: menu.sh:1789 +#: menu.sh:266 menu.sh:412 menu.sh:542 menu.sh:682 menu.sh:995 menu.sh:1640 +#: menu.sh:1788 menu.sh:1852 msgid "Exit" msgstr "" #: menu.sh:278 menu.sh:283 menu.sh:289 menu.sh:300 menu.sh:308 menu.sh:326 #: menu.sh:340 menu.sh:345 menu.sh:349 menu.sh:363 menu.sh:367 menu.sh:374 -#: menu.sh:377 menu.sh:1768 +#: menu.sh:377 menu.sh:1767 msgid "Addons" msgstr "" @@ -306,7 +306,7 @@ msgstr "" msgid "Select addon to remove" msgstr "" -#: menu.sh:346 menu.sh:1236 menu.sh:1267 menu.sh:1300 menu.sh:1703 +#: menu.sh:346 menu.sh:1236 menu.sh:1267 menu.sh:1300 menu.sh:1702 msgid "This feature is only available when accessed via web/ssh." msgstr "" @@ -314,7 +314,7 @@ msgstr "" msgid "Please upload the *.addons file." msgstr "" -#: menu.sh:364 menu.sh:517 menu.sh:1730 menu.sh:1744 +#: menu.sh:364 menu.sh:517 menu.sh:1729 menu.sh:1743 msgid "Not a valid file, please try again!" msgstr "" @@ -331,7 +331,7 @@ msgid "File format not recognized!" msgstr "" #: menu.sh:393 menu.sh:421 menu.sh:425 menu.sh:442 menu.sh:455 menu.sh:469 -#: menu.sh:475 menu.sh:494 menu.sh:497 menu.sh:512 menu.sh:516 menu.sh:1769 +#: menu.sh:475 menu.sh:494 menu.sh:497 menu.sh:512 menu.sh:516 menu.sh:1768 msgid "Modules" msgstr "" @@ -608,7 +608,7 @@ msgstr "" msgid "Addon %s not found!" msgstr "" -#: menu.sh:953 menu.sh:1838 +#: menu.sh:953 menu.sh:1837 msgid "Cleaning" msgstr "" @@ -691,7 +691,7 @@ msgstr "" msgid "Advanced" msgstr "" -#: menu.sh:998 menu.sh:1792 +#: menu.sh:998 menu.sh:1791 msgid "Choose the option" msgstr "" @@ -899,7 +899,7 @@ msgstr "" msgid "Config changed, would you like to rebuild the loader?" msgstr "" -#: menu.sh:1461 menu.sh:1783 +#: menu.sh:1461 menu.sh:1782 msgid "Choose a language" msgstr "" @@ -911,8 +911,8 @@ msgstr "" msgid "Choice a keymap" msgstr "" -#: menu.sh:1505 menu.sh:1538 menu.sh:1589 menu.sh:1646 menu.sh:1654 -#: menu.sh:1662 menu.sh:1670 +#: menu.sh:1505 menu.sh:1538 menu.sh:1588 menu.sh:1645 menu.sh:1653 +#: menu.sh:1661 menu.sh:1669 msgid "Update %s" msgstr "" @@ -936,7 +936,7 @@ msgstr "" msgid "Error downloading new version" msgstr "" -#: menu.sh:1540 menu.sh:1591 +#: menu.sh:1540 menu.sh:1590 msgid "Extracting last version" msgstr "" @@ -962,125 +962,145 @@ msgstr "" msgid "Arpl updated with success to %s!\\nReboot?" msgstr "" -#: menu.sh:1597 +#: menu.sh:1596 msgid "Installing new %s" msgstr "" -#: menu.sh:1625 +#: menu.sh:1624 msgid "%s updated with success!" msgstr "" -#: menu.sh:1635 +#: menu.sh:1634 msgid "Update arpl" msgstr "" -#: menu.sh:1636 +#: menu.sh:1635 msgid "Update addons" msgstr "" -#: menu.sh:1637 +#: menu.sh:1636 msgid "Update modules" msgstr "" -#: menu.sh:1638 +#: menu.sh:1637 msgid "Update LKMs" msgstr "" -#: menu.sh:1639 +#: menu.sh:1638 msgid "Set proxy server" msgstr "" -#: menu.sh:1640 +#: menu.sh:1639 msgid "Local upload" msgstr "" -#: menu.sh:1646 +#: menu.sh:1645 msgid "arpl" msgstr "" -#: menu.sh:1654 +#: menu.sh:1653 msgid "addons" msgstr "" -#: menu.sh:1662 +#: menu.sh:1661 msgid "modules" msgstr "" -#: menu.sh:1670 +#: menu.sh:1669 msgid "LKMs" msgstr "" -#: menu.sh:1680 menu.sh:1691 menu.sh:1702 menu.sh:1712 menu.sh:1729 -#: menu.sh:1743 +#: menu.sh:1679 menu.sh:1690 menu.sh:1701 menu.sh:1711 menu.sh:1728 +#: menu.sh:1742 msgid "Update" msgstr "" -#: menu.sh:1681 +#: menu.sh:1680 msgid "Please enter a proxy server url" msgstr "" -#: menu.sh:1692 +#: menu.sh:1691 msgid "Invalid proxy server url, continue?" msgstr "" -#: menu.sh:1707 +#: menu.sh:1706 msgid "" "Please keep the attachment name consistent with the attachment name on " "Github.\\n" msgstr "" -#: menu.sh:1708 +#: menu.sh:1707 msgid "Upload update.zip will update arpl.\\n" msgstr "" -#: menu.sh:1709 +#: menu.sh:1708 msgid "Upload addons.zip will update Addons.\\n" msgstr "" -#: menu.sh:1710 +#: menu.sh:1709 msgid "Upload modules.zip will update Modules.\\n" msgstr "" -#: menu.sh:1711 +#: menu.sh:1710 msgid "Upload rp-lkms.zip will update LKMs.\\n" msgstr "" -#: menu.sh:1764 +#: menu.sh:1763 msgid "Choose a model" msgstr "" -#: menu.sh:1770 +#: menu.sh:1769 msgid "Cmdline menu" msgstr "" -#: menu.sh:1771 +#: menu.sh:1770 msgid "Synoinfo menu" msgstr "" -#: menu.sh:1774 +#: menu.sh:1773 msgid "Advanced menu" msgstr "" -#: menu.sh:1777 +#: menu.sh:1776 msgid "Build the loader" msgstr "" -#: menu.sh:1781 +#: menu.sh:1780 msgid "Boot the loader" msgstr "" -#: menu.sh:1784 +#: menu.sh:1783 msgid "Choose a keymap" msgstr "" -#: menu.sh:1786 +#: menu.sh:1785 msgid "Clean disk cache" msgstr "" -#: menu.sh:1788 +#: menu.sh:1787 msgid "Update menu" msgstr "" +#: menu.sh:1847 +msgid "Choose a action" +msgstr "" + +#: menu.sh:1848 +msgid "Poweroff" +msgstr "" + +#: menu.sh:1849 +msgid "Reboot" +msgstr "" + #: menu.sh:1850 +msgid "Reboot to arpl" +msgstr "" + +#: menu.sh:1851 +msgid "Back to shell" +msgstr "" + +#: menu.sh:1877 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 9f44ec223313414672be962f292b5d265abbf872..c05fbb9efddcbc868a71c2cb15cccd89beeffaff 100644 GIT binary patch delta 5700 zcmZA533yId0><%^lvomp#1>0-6p1C)h_w-dv>Mykw+OX_SkfBW&X=)_SfdlksHG@V zYN;hk>`OD2>QKZGIv7N0b(*T_6gBDp{q8Z(JaZrK_dDk<=bm%!xtB-QdXHZ|^l;q> zD3fEfc^Fd%>XbKTh{~1Sdrf9FV=7WyfPuIiYvFcmgQqbGO?6}9pf~#9a;$;tQP=Iq zDtHm&@g8~^<1&$)#XU`Ptc2~bEcQTk=yhy}srGm-22tOLy3q+t#PjHfwYi%*9Elo3 zYve{I!P*O>srSdG+~3Tn;LDDEs0L4BI9@`3{0SMPDPPku80oxeiMnB;b%=E$>bkdW zeF>`lHMYJDY0@0R0Pb%tQwYZU$RAUV`Bl%uPz^P=^?1}w^+z>09ACysSPpYg16YHa zfi0->KE+m8fJ~Bkit2bkZRTIkE}X(loQ~?qcUT5}n14Mpe+KTjTWP(Xf0|4`L=!v+fu)US|hdS ztvVdakJ{;k6|gtz_z={MMj@A&caVFVm8b#k3ugY+(?jgg;wwZobQ_cLF)|ruK!`DQ zaXP9)E6_bcY)SnnY9=1z0`v}b+Q~u9z$Wy@L#Ri48Y8gCML{Efj#{NP!knH3Blk8D zsD|T^Q_LXLGoFRIZa!*pu19rjpFMsO)!rr4OkA_|Tc{cN8ntFzo-B2ZydvsAAhy63 zs405`^(f|{ZukK3Uyu#au3r7)v6CtRXiM9K?qZ;Ukdgjwn9oURov`0~I!9~=J-9|l{XQ&zRXSx`%iA3#B z#6a$EMp4kBn1xy_i%=t4hq_<~s)6&U^B$lU3i92PdLl}KpH#ryE;2CU-9+7&Ge7dnO9>jU*7sacL zIXDKx8}q7TCb|dGn9GrY}8^}XOEvit&Q8r@-d~T1|ym} z-}aX1MSUz*z)9$hGf)GbW9#oVrQ15Nh8@26F=`6)QP1#8WR}eXR0sW=8Fz={2bOo4zcX2F6MLYFu97+AUi-JblzPazREbtsqxQyHUBi?ajr6wCnZgMYwRun5)B+AJ8oRSi&!w+mL)vKc|4J3G=*BRFg= zKwWs&)~{j!^_!@veuR2tm1CSo6@ofH276#vRC`%=f39@{mS_J?_i>*8ehSR8Ifnc( zKl0-q8B1G>rvrv!0&3*rke-{jP#s!i{Q%X0UDhMkv(~HDV(TOH(rZ&{cX-7*4OT&o zus#N2JgVVgs1Z#--FPahgLCcirKq=J73vx1qdI&HE8;oS`9;W^Ywn;+&)&D4GnL`k zk$NgQ5{S~t^R?iHI#zYF&%5*B2>pWSogN)`S)eV z8GAxd2j{|8s1v)QyFt`QQmoVL@eFLt{%lkSkE3SnG^zvtK#lkZd;A${0G^Ce26klr zbwLw$sDT93g}qQC8jc#lMC6Z|&5uTW9P8qB)cK~9vt}xzW-JWVZX%{)iamY-b^dKs z`;T0

QA-;T7qitxwQ=M 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 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 1f2746a1..3d3705a8 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-07-07 17:21+0800\n" -"PO-Revision-Date: 2023-07-07 17:22+0800\n" +"POT-Creation-Date: 2023-07-09 11:51+0800\n" +"PO-Revision-Date: 2023-07-09 11:51+0800\n" "Last-Translator: ing \n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" @@ -222,7 +222,7 @@ msgstr "显示测试型号" msgid "Choose the model" msgstr "选择型号" -#: menu.sh:154 menu.sh:1766 +#: menu.sh:154 menu.sh:1765 msgid "Choose a product version" msgstr "选择版本" @@ -250,7 +250,7 @@ msgstr "获取线上pat数据 .." msgid "Reconfiguring Synoinfo, Addons and Modules" msgstr "重新配置 Syninfo, 插件和模块" -#: menu.sh:260 menu.sh:405 menu.sh:546 menu.sh:687 menu.sh:1634 +#: menu.sh:260 menu.sh:405 menu.sh:546 menu.sh:687 menu.sh:1633 msgid "Choose a option" msgstr "设置" @@ -274,14 +274,14 @@ msgstr "显示所有可用插件" msgid "Upload a external addon" msgstr "上传外部插件" -#: menu.sh:266 menu.sh:412 menu.sh:542 menu.sh:682 menu.sh:995 menu.sh:1641 -#: menu.sh:1789 +#: menu.sh:266 menu.sh:412 menu.sh:542 menu.sh:682 menu.sh:995 menu.sh:1640 +#: menu.sh:1788 menu.sh:1852 msgid "Exit" msgstr "退出" #: menu.sh:278 menu.sh:283 menu.sh:289 menu.sh:300 menu.sh:308 menu.sh:326 #: menu.sh:340 menu.sh:345 menu.sh:349 menu.sh:363 menu.sh:367 menu.sh:374 -#: menu.sh:377 menu.sh:1768 +#: menu.sh:377 menu.sh:1767 msgid "Addons" msgstr "插件" @@ -305,7 +305,7 @@ msgstr "没有要删除的用户插件" msgid "Select addon to remove" msgstr "选择要删除的插件" -#: menu.sh:346 menu.sh:1236 menu.sh:1267 menu.sh:1300 menu.sh:1703 +#: menu.sh:346 menu.sh:1236 menu.sh:1267 menu.sh:1300 menu.sh:1702 msgid "This feature is only available when accessed via web/ssh." msgstr "此功能仅通过web/ssh访问时可用." @@ -313,7 +313,7 @@ msgstr "此功能仅通过web/ssh访问时可用." msgid "Please upload the *.addons file." msgstr "请上传 *.addons 文件." -#: menu.sh:364 menu.sh:517 menu.sh:1730 menu.sh:1744 +#: menu.sh:364 menu.sh:517 menu.sh:1729 menu.sh:1743 msgid "Not a valid file, please try again!" msgstr "不是有效的文件, 请重试!" @@ -330,7 +330,7 @@ msgid "File format not recognized!" msgstr "文件格式无法识别!" #: menu.sh:393 menu.sh:421 menu.sh:425 menu.sh:442 menu.sh:455 menu.sh:469 -#: menu.sh:475 menu.sh:494 menu.sh:497 menu.sh:512 menu.sh:516 menu.sh:1769 +#: menu.sh:475 menu.sh:494 menu.sh:497 menu.sh:512 menu.sh:516 menu.sh:1768 msgid "Modules" msgstr "模块" @@ -607,7 +607,7 @@ msgstr "拷贝文件: " msgid "Addon %s not found!" msgstr "插件 %s 未找到!" -#: menu.sh:953 menu.sh:1838 +#: menu.sh:953 menu.sh:1837 msgid "Cleaning" msgstr "清除中" @@ -690,7 +690,7 @@ msgstr "开发者工具" msgid "Advanced" msgstr "高级" -#: menu.sh:998 menu.sh:1792 +#: menu.sh:998 menu.sh:1791 msgid "Choose the option" msgstr "设置" @@ -898,7 +898,7 @@ msgstr "警告" msgid "Config changed, would you like to rebuild the loader?" msgstr "配置已更改, 是否重新编译引导?" -#: menu.sh:1461 menu.sh:1783 +#: menu.sh:1461 menu.sh:1782 msgid "Choose a language" msgstr "选择语言" @@ -910,8 +910,8 @@ msgstr "选择布局" msgid "Choice a keymap" msgstr "选择键盘" -#: menu.sh:1505 menu.sh:1538 menu.sh:1589 menu.sh:1646 menu.sh:1654 -#: menu.sh:1662 menu.sh:1670 +#: menu.sh:1505 menu.sh:1538 menu.sh:1588 menu.sh:1645 menu.sh:1653 +#: menu.sh:1661 menu.sh:1669 msgid "Update %s" msgstr "更新 %s" @@ -935,7 +935,7 @@ msgstr "下载新版本中" msgid "Error downloading new version" msgstr "下载新版本错误" -#: menu.sh:1540 menu.sh:1591 +#: menu.sh:1540 menu.sh:1590 msgid "Extracting last version" msgstr "解压新版本" @@ -961,125 +961,145 @@ msgstr "安装更新中" msgid "Arpl updated with success to %s!\\nReboot?" msgstr "Arpl更新成功 %s!\\n重启?" -#: menu.sh:1597 +#: menu.sh:1596 msgid "Installing new %s" msgstr "安装新 %s 中" -#: menu.sh:1625 +#: menu.sh:1624 msgid "%s updated with success!" msgstr "%s 更新成功!" -#: menu.sh:1635 +#: menu.sh:1634 msgid "Update arpl" msgstr "更新arpl" -#: menu.sh:1636 +#: menu.sh:1635 msgid "Update addons" msgstr "更新插件" -#: menu.sh:1637 +#: menu.sh:1636 msgid "Update modules" msgstr "更新模块" -#: menu.sh:1638 +#: menu.sh:1637 msgid "Update LKMs" msgstr "更新LKMs" -#: menu.sh:1639 +#: menu.sh:1638 msgid "Set proxy server" msgstr "设置代理" -#: menu.sh:1640 +#: menu.sh:1639 msgid "Local upload" msgstr "本地上传" -#: menu.sh:1646 +#: menu.sh:1645 msgid "arpl" msgstr "arpl" -#: menu.sh:1654 +#: menu.sh:1653 msgid "addons" msgstr "插件" -#: menu.sh:1662 +#: menu.sh:1661 msgid "modules" msgstr "模块" -#: menu.sh:1670 +#: menu.sh:1669 msgid "LKMs" msgstr "LKMs" -#: menu.sh:1680 menu.sh:1691 menu.sh:1702 menu.sh:1712 menu.sh:1729 -#: menu.sh:1743 +#: menu.sh:1679 menu.sh:1690 menu.sh:1701 menu.sh:1711 menu.sh:1728 +#: menu.sh:1742 msgid "Update" msgstr "更新" -#: menu.sh:1681 +#: menu.sh:1680 msgid "Please enter a proxy server url" msgstr "请输入代理服务器url" -#: menu.sh:1692 +#: menu.sh:1691 msgid "Invalid proxy server url, continue?" msgstr "无效的代理服务器url,是否继续?" -#: menu.sh:1707 +#: menu.sh:1706 msgid "" "Please keep the attachment name consistent with the attachment name on " "Github.\\n" msgstr "请保持附件名称与 github 上附件名称一致.\\n" -#: menu.sh:1708 +#: menu.sh:1707 msgid "Upload update.zip will update arpl.\\n" msgstr "上传 update.zip 将更新 arpl.\\n" -#: menu.sh:1709 +#: menu.sh:1708 msgid "Upload addons.zip will update Addons.\\n" msgstr "上传 addons.zip 将更新 插件.\\n" -#: menu.sh:1710 +#: menu.sh:1709 msgid "Upload modules.zip will update Modules.\\n" msgstr "上传 modules.zip 将更新 模块.\\n" -#: menu.sh:1711 +#: menu.sh:1710 msgid "Upload rp-lkms.zip will update LKMs.\\n" msgstr "上传 rp-lkms.zip 将更新 LKMs.\\n" -#: menu.sh:1764 +#: menu.sh:1763 msgid "Choose a model" msgstr "选择型号" -#: menu.sh:1770 +#: menu.sh:1769 msgid "Cmdline menu" msgstr "设置Cmdline" -#: menu.sh:1771 +#: menu.sh:1770 msgid "Synoinfo menu" msgstr "设置Synoinfo" -#: menu.sh:1774 +#: menu.sh:1773 msgid "Advanced menu" msgstr "高级设置" -#: menu.sh:1777 +#: menu.sh:1776 msgid "Build the loader" msgstr "编译引导" -#: menu.sh:1781 +#: menu.sh:1780 msgid "Boot the loader" msgstr "启动" -#: menu.sh:1784 +#: menu.sh:1783 msgid "Choose a keymap" msgstr "选择键盘" -#: menu.sh:1786 +#: menu.sh:1785 msgid "Clean disk cache" msgstr "清除磁盘缓存" -#: menu.sh:1788 +#: menu.sh:1787 msgid "Update menu" msgstr "更新" +#: menu.sh:1847 +msgid "Choose a action" +msgstr "选择动作" + +#: menu.sh:1848 +msgid "Poweroff" +msgstr "关机" + +#: menu.sh:1849 +msgid "Reboot" +msgstr "重启" + #: menu.sh:1850 +msgid "Reboot to arpl" +msgstr "重启到arpl" + +#: menu.sh:1851 +msgid "Back to shell" +msgstr "退出到shell" + +#: menu.sh:1877 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 a303b0e6..a7b5fdb9 100755 --- a/files/board/arpl/overlayfs/opt/arpl/menu.sh +++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh @@ -1579,8 +1579,7 @@ function updateArpl() { fi done < <(readConfigMap "replace" "/tmp/update-list.yml") dialog --backtitle "$(backtitle)" --colors --title "${T}" \ - --yesno "$(printf "$(TEXT "Arpl updated with success to %s!\nReboot?")" "${TAG}")" 0 0 - [ $? -ne 0 ] && continue + --msgbox "$(printf "$(TEXT "Arpl updated with success to %s!\nReboot?")" "${TAG}")" 0 0 arpl-reboot.sh config } @@ -1842,7 +1841,35 @@ while true; do updateMenu ;; e) - break + NEXT="e" + while true; do + dialog --backtitle "$(backtitle)" --colors \ + --default-item ${NEXT} --menu "$(TEXT "Choose a action")" 0 0 0 \ + p "$(TEXT "Poweroff")" \ + r "$(TEXT "Reboot")" \ + c "$(TEXT "Reboot to arpl")" \ + s "$(TEXT "Back to shell")" \ + e "$(TEXT "Exit")" \ + 2>${TMP_PATH}/resp + [ $? -ne 0 ] && break + case "$(<${TMP_PATH}/resp)" in + p) + poweroff + ;; + r) + reboot + ;; + c) + arpl-reboot.sh config + ;; + s) + break 2 + ;; + e) + break + ;; + esac + done ;; esac done diff --git a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh index fb5adfc4..0c566c18 100755 --- a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh +++ b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh @@ -23,7 +23,10 @@ SPACELEFT=$(df --block-size=1 | awk '/'${LOADER_DEVICE_NAME}'3/{print$4}') echo -n "." rm -rf "${RAMDISK_PATH}" # Force clean mkdir -p "${RAMDISK_PATH}" -(cd "${RAMDISK_PATH}"; xz -dc <"${ORI_RDGZ_FILE}" | cpio -idm) >/dev/null 2>&1 +( + cd "${RAMDISK_PATH}" + xz -dc <"${ORI_RDGZ_FILE}" | cpio -idm +) >/dev/null 2>&1 # get user data MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")" @@ -40,7 +43,7 @@ PATSUM="$(readConfigKey "patsum" "${USER_CONFIG_FILE}")" # Check if DSM buildnumber changed . "${RAMDISK_PATH}/etc/VERSION" -if [ -n "${PRODUCTVER}" -a -n "${BUILDNUM}" -a -n "${SMALLNUM}" ] && \ +if [ -n "${PRODUCTVER}" -a -n "${BUILDNUM}" -a -n "${SMALLNUM}" ] && ([ ! "${PRODUCTVER}" = "${majorversion}.${minorversion}" ] || [ ! "${BUILDNUM}" = "${buildnumber}" ] || [ ! "${SMALLNUM}" = "${smallfixnumber}" ]); then OLDVER="${PRODUCTVER}(${BUILDNUM}$([ ${SMALLNUM:-0} -ne 0 ] && echo "u${SMALLNUM}"))" NEWVER="${majorversion}.${minorversion}(${buildnumber}$([ ${smallfixnumber:-0} -ne 0 ] && echo "u${smallfixnumber}"))" @@ -146,14 +149,14 @@ DT="$(readModelKey "${MODEL}" "dt")" echo -n "." mkdir -p "${RAMDISK_PATH}/addons" -echo "#!/bin/sh" >"${RAMDISK_PATH}/addons/addons.sh" +echo "#!/bin/sh" >"${RAMDISK_PATH}/addons/addons.sh" echo 'echo "addons.sh called with params ${@}"' >>"${RAMDISK_PATH}/addons/addons.sh" -echo "export PLATFORM=${PLATFORM}" >>"${RAMDISK_PATH}/addons/addons.sh" -echo "export MODEL=${MODEL}" >>"${RAMDISK_PATH}/addons/addons.sh" -echo "export MLINK=${PATURL}" >>"${RAMDISK_PATH}/addons/addons.sh" -echo "export MCHECKSUM=${PATSUM}" >>"${RAMDISK_PATH}/addons/addons.sh" -echo "export LAYOUT=${LAYOUT}" >>"${RAMDISK_PATH}/addons/addons.sh" -echo "export KEYMAP=${KEYMAP}" >>"${RAMDISK_PATH}/addons/addons.sh" +echo "export PLATFORM=${PLATFORM}" >>"${RAMDISK_PATH}/addons/addons.sh" +echo "export MODEL=${MODEL}" >>"${RAMDISK_PATH}/addons/addons.sh" +echo "export MLINK=${PATURL}" >>"${RAMDISK_PATH}/addons/addons.sh" +echo "export MCHECKSUM=${PATSUM}" >>"${RAMDISK_PATH}/addons/addons.sh" +echo "export LAYOUT=${LAYOUT}" >>"${RAMDISK_PATH}/addons/addons.sh" +echo "export KEYMAP=${KEYMAP}" >>"${RAMDISK_PATH}/addons/addons.sh" chmod +x "${RAMDISK_PATH}/addons/addons.sh" # Required addons: eudev, disks, wol diff --git a/files/board/arpl/overlayfs/var/www/data/index.html b/files/board/arpl/overlayfs/var/www/data/index.html index 54589401..cd0d15d2 100644 --- a/files/board/arpl/overlayfs/var/www/data/index.html +++ b/files/board/arpl/overlayfs/var/www/data/index.html @@ -1,6 +1,8 @@ + + \ No newline at end of file