update 2024-11-29 20:41:15

This commit is contained in:
kenzok8 2024-11-29 20:41:15 +08:00
parent 9aa734a1b1
commit 9ff9e56dbb
4 changed files with 26 additions and 9 deletions

View File

@ -562,13 +562,13 @@ return view.extend({
o = s.taboption('experimental', form.SectionValue, '_experimental', form.NamedSection, 'experimental', 'fchomo', null);
ss = o.subsection;
so = ss.option(form.Flag, 'quic_go_disable_gso', _('quic-go-disable-gso'));
so = ss.option(form.Flag, 'quic_go_disable_gso', _('Disable GSO of quic-go'));
so.default = so.disabled;
so = ss.option(form.Flag, 'quic_go_disable_ecn', _('quic-go-disable-ecn'));
so = ss.option(form.Flag, 'quic_go_disable_ecn', _('Disable ECN of quic-go'));
so.default = so.disabled;
so = ss.option(form.Flag, 'dialer_ip4p_convert', _('dialer-ip4p-convert'));
so = ss.option(form.Flag, 'dialer_ip4p_convert', _('Enable IP4P conversion when dialing'));
so.default = so.disabled;
/* Experimental END */

View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk
PKG_VERSION:=1.1.3-20241110
PKG_VERSION:=1.1.5-20241129
PKG_RELEASE:=
LUCI_TITLE:=LuCI support for istoredup

View File

@ -3,6 +3,7 @@ LuCI - Lua Configuration Interface
]]--
local taskd = require "luci.model.tasks"
local docker = require "luci.docker"
local istoredup_model = require "luci.model.istoredup"
local m, s, o
@ -11,10 +12,22 @@ m = taskd.docker_map("istoredup", "istoredup", "/usr/libexec/istorec/istoredup.s
translate("A duplica of iStoreOS.")
.. translate("Official website:") .. ' <a href=\"https://www.istoreos.com/\" target=\"_blank\">https://www.istoreos.com/</a>')
local dk = docker.new({socket_path="/var/run/docker.sock"})
local dockerd_running = dk:_ping().code == 200
local docker_info = dockerd_running and dk:info().body or {}
local docker_aspace = 0
if docker_info.DockerRootDir then
local statvfs = nixio.fs.statvfs(docker_info.DockerRootDir)
docker_aspace = statvfs and (statvfs.bavail * statvfs.bsize) or 0
end
s = m:section(SimpleSection, translate("Service Status"), translate("iStoreDup status:"))
s:append(Template("istoredup/status"))
s = m:section(TypedSection, "istoredup", translate("Setup"), translate("The following parameters will only take effect during installation or upgrade:"))
s = m:section(TypedSection, "istoredup", translate("Setup"),
(docker_aspace < 2147483648 and
(translate("The free space of Docker is less than 2GB, which may cause the installation to fail.")
.. "<br>") or "") .. translate("The following parameters will only take effect during installation or upgrade:"))
s.addremove=false
s.anonymous=true
@ -22,7 +35,12 @@ o = s:option(Value, "image_name", translate("Image").."<b>*</b>")
o.rmempty = false
o.datatype = "string"
o:value("linkease/istoreduprk35xx:latest", "linkease/istoreduprk35xx:latest")
o.default = "linkease/istoreduprk35xx:latest"
o:value("linkease/istoredupx86_64:latest", "linkease/istoredupx86_64:latest")
if "x86_64" == docker_info.Architecture then
o.default = "linkease/istoredupx86_64:latest"
else
o.default = "linkease/istoreduprk35xx:latest"
end
o = s:option(Value, "time_zone", translate("Timezone"))
o.datatype = "string"

View File

@ -7,9 +7,8 @@ do_install() {
local IMAGE_NAME=`uci get istoredup.@istoredup[0].image_name 2>/dev/null`
source /etc/openwrt_release
case ${DISTRIB_TARGET} in
*x86)
echo "Unsupported ${DISTRIB_TARGET} NOW"
exit 1
*x86*)
echo "${DISTRIB_TARGET} supported"
;;
*rk35xx)
echo "${DISTRIB_TARGET} supported"