diff --git a/linkease/Makefile b/linkease/Makefile index 727af7c67..b63801e6a 100644 --- a/linkease/Makefile +++ b/linkease/Makefile @@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk PKG_ARCH_LINKEASE:=$(ARCH) PKG_NAME:=linkease -PKG_VERSION:=0.7.7 +PKG_VERSION:=0.8.1 PKG_RELEASE:=$(PKG_ARCH_LINKEASE)-1 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://fw.koolcenter.com/binary/LinkEase/LinuxStorage/ -PKG_HASH:=2d98b1c704afafca49623e6b3b32ba4d4251dd5822dfdc29bc4613cc782568f0 +PKG_HASH:=4bfc6e916324d305ad3309cb46ad78c6e356bca79b4cef75accf82b018600105 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION) diff --git a/luci-app-amlogic/Makefile b/luci-app-amlogic/Makefile index 241e44897..d7557d475 100644 --- a/luci-app-amlogic/Makefile +++ b/luci-app-amlogic/Makefile @@ -16,7 +16,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-amlogic -PKG_VERSION:=3.1.108 +PKG_VERSION:=3.1.110 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0 License diff --git a/luci-app-amlogic/htdocs/luci-static/resources/amlogic/switch.png b/luci-app-amlogic/htdocs/luci-static/resources/amlogic/switch.png new file mode 100644 index 000000000..2a3577a9d Binary files /dev/null and b/luci-app-amlogic/htdocs/luci-static/resources/amlogic/switch.png differ diff --git a/luci-app-amlogic/luasrc/controller/amlogic.lua b/luci-app-amlogic/luasrc/controller/amlogic.lua index eb2c87017..6288ef7da 100644 --- a/luci-app-amlogic/luasrc/controller/amlogic.lua +++ b/luci-app-amlogic/luasrc/controller/amlogic.lua @@ -44,6 +44,7 @@ function index() entry({ "admin", "system", "amlogic", "start_openwrt_author" }, call("action_openwrt_author")).leaf = true entry({ "admin", "system", "amlogic", "state" }, call("action_state")).leaf = true entry({ "admin", "system", "amlogic", "start_poweroff" }, call("action_poweroff")).leaf = true + entry({ "admin", "system", "amlogic", "start_switch" }, call("action_switch")).leaf = true end --Remove the spaces in the string @@ -450,3 +451,10 @@ end function action_poweroff() luci.sys.exec("/sbin/poweroff") end + +--Switching dual partition +function action_switch() + luci.sys.exec("[ -f /boot/efi/EFI/BOOT/grub.cfg.prev ] && (cd /boot/efi/EFI/BOOT/ && mv -f grub.cfg grub.cfg.bak && mv -f grub.cfg.prev grub.cfg && mv -f grub.cfg.bak grub.cfg.prev)") + luci.sys.exec("sync && reboot") +end + diff --git a/luci-app-amlogic/luasrc/model/cbi/amlogic/amlogic_backup.lua b/luci-app-amlogic/luasrc/model/cbi/amlogic/amlogic_backup.lua index 9a232a369..a3a008c90 100644 --- a/luci-app-amlogic/luasrc/model/cbi/amlogic/amlogic_backup.lua +++ b/luci-app-amlogic/luasrc/model/cbi/amlogic/amlogic_backup.lua @@ -5,13 +5,20 @@ local io = require "io" local os = require "os" local fs = require "nixio.fs" -local b, c +local b, c, x -- Checks wheather the given path exists and points to a directory. function isdirectory(dirname) return fs.stat(dirname, "type") == "dir" end +-- Check if a file or directory exists +function file_exists(path) + local file = io.open(path, "rb") + if file then file:close() end + return file ~= nil +end + --SimpleForm for Backup Config b = SimpleForm("backup", nil) b.title = translate("Backup Firmware Config") @@ -90,10 +97,22 @@ w.render = function(self, section, scope) end w.write = function(self, section, scope) - local x = luci.sys.exec("btrfs subvolume snapshot -r /etc /.snapshots/etc-" .. os.date("%m.%d.%H%M%S") .. " 2>/dev/null && sync") + local x = luci.sys.exec("btrfs subvolume snapshot -r /etc /.snapshots/etc-" .. + os.date("%m.%d.%H%M%S") .. " 2>/dev/null && sync") luci.http.redirect(luci.dispatcher.build_url("admin", "system", "amlogic", "backup")) end w = d:option(TextValue, "snapshot_list", nil) w.template = "amlogic/other_snapshot" -return b, c +--KVM virtual machine switching dual partition +if file_exists("/boot/efi/EFI/BOOT/grub.cfg.prev") then + x = SimpleForm("kvm", nil) + x.title = translate("KVM dual system switching") + x.description = translate("You can freely switch between KVM dual partitions, using OpenWrt systems in different partitions.") + x.reset = false + x.submit = false + + x:section(SimpleSection).template = "amlogic/other_kvm" +end + +return b, c, x diff --git a/luci-app-amlogic/luasrc/view/amlogic/other_kvm.htm b/luci-app-amlogic/luasrc/view/amlogic/other_kvm.htm new file mode 100644 index 000000000..710fe55d7 --- /dev/null +++ b/luci-app-amlogic/luasrc/view/amlogic/other_kvm.htm @@ -0,0 +1,48 @@ + +
+ + +
+ +

+ <%:Loading%> + + <%:System is switching...%> +

+
+
+ + diff --git a/luci-app-amlogic/po/zh-cn/amlogic.po b/luci-app-amlogic/po/zh-cn/amlogic.po index dca27d51b..fe2881d3f 100644 --- a/luci-app-amlogic/po/zh-cn/amlogic.po +++ b/luci-app-amlogic/po/zh-cn/amlogic.po @@ -284,6 +284,27 @@ msgstr "瑞芯微 3328 -- [ 贝壳云、我家云 ]" msgid "Used in KVM ----- [ Can be used in KVM virtual machine of Armbian system. ]" msgstr "KVM 中使用 --- [ 可以在 Armbia 系统的 KVM 虚拟机中使用。 ]" +msgid "KVM dual system switching" +msgstr "KVM 双系统切换" + +msgid "You can freely switch between KVM dual partitions, using OpenWrt systems in different partitions." +msgstr "您可以在 KVM 双分区之间自由切换，使用不同分区中的 OpenWrt 系统。" + +msgid "Switch System" +msgstr "切换系统" + +msgid "System is switching..." +msgstr "系统切换中..." + +msgid "Waiting for system switching..." +msgstr "等待系统完成切换..." + +msgid "System switchover succeeded, restarting..." +msgstr "系统切换成功，正在重启..." + +msgid "Are you sure you want to switch systems?" +msgstr "你确定要切换系统吗？" + msgid "Install Ipk" msgstr "安装Ipk" diff --git a/luci-app-amlogic/root/usr/sbin/openwrt-backup b/luci-app-amlogic/root/usr/sbin/openwrt-backup index 50ae9ed1f..e0658c482 100755 --- a/luci-app-amlogic/root/usr/sbin/openwrt-backup +++ b/luci-app-amlogic/root/usr/sbin/openwrt-backup @@ -5,7 +5,7 @@ # Copyright (C) 2021-- https://github.com/ophub/luci-app-amlogic #====================================================================== -VERSION="v1.2" +VERSION="v1.3" ZSTD_LEVEL=6 SNAPSHOT_PRESTR=".snapshots/" BACKUP_DIR="/.reserved" @@ -81,8 +81,13 @@ elif dmesg | grep 'rockchip' >/dev/null 2>&1; then elif dmesg | grep 'sun50i-h6' >/dev/null 2>&1; then PLATFORM="allwinner" else - echo "Unknown platform, only support amlogic or rockchip or allwinner h6!" - exit 1 + source /etc/flippy-openwrt-release + case $PLATFORM in + amlogic|rockchip|allwinner|qemu-aarch64) : ;; + *) echo "Unknown platform, only support amlogic or rockchip or allwinner h6 or qemu-aarch64!" + exit 1 + ;; + esac fi backup() { diff --git a/luci-app-nft-qos/po/de/nft-qos.po b/luci-app-nft-qos/po/de/nft-qos.po index 789305ff8..831812f5f 100644 --- a/luci-app-nft-qos/po/de/nft-qos.po +++ b/luci-app-nft-qos/po/de/nft-qos.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2022-02-24 06:56+0000\n" +"PO-Revision-Date: 2022-07-21 13:22+0000\n" "Last-Translator: ssantos \n" "Language-Team: German \n" @@ -8,7 +8,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.11-dev\n" +"X-Generator: Weblate 4.14-dev\n" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:136 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:155 @@ -121,12 +121,14 @@ msgid "Limit Enable" msgstr "Limit aktivieren" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:33 +#, fuzzy msgid "Limit Rate by IP Address" -msgstr "" +msgstr "Quote pro IP-Adresse begrenzen" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:34 +#, fuzzy msgid "Limit Rate by Mac Address" -msgstr "" +msgstr "Quote pro MAC-Adresse begrenzen" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:239 msgid "Limit Traffic Rate By Mac Address" @@ -236,7 +238,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:35 msgid "Traffic Priority" -msgstr "" +msgstr "Traffic-Priorität" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:199 msgid "Traffic Priority Settings" diff --git a/luci-app-nft-qos/po/pt/nft-qos.po b/luci-app-nft-qos/po/pt/nft-qos.po index 3147ecb68..c5cde5cd2 100644 --- a/luci-app-nft-qos/po/pt/nft-qos.po +++ b/luci-app-nft-qos/po/pt/nft-qos.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2020-09-18 18:36+0000\n" +"PO-Revision-Date: 2022-07-20 17:18+0000\n" "Last-Translator: ssantos \n" "Language-Team: Portuguese \n" @@ -8,7 +8,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.3-dev\n" +"X-Generator: Weblate 4.14-dev\n" #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:136 #: applications/luci-app-nft-qos/luasrc/view/nft-qos/rate.htm:155 @@ -122,11 +122,11 @@ msgstr "Limitar Ativação" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:33 msgid "Limit Rate by IP Address" -msgstr "" +msgstr "Limite da taxa por endereço IP" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:34 msgid "Limit Rate by Mac Address" -msgstr "" +msgstr "Limite da taxa por endereço Mac" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:239 msgid "Limit Traffic Rate By Mac Address" @@ -233,7 +233,7 @@ msgstr "" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:35 msgid "Traffic Priority" -msgstr "" +msgstr "Prioridade de tráfego" #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:199 msgid "Traffic Priority Settings"