update 2024-07-18 22:32:15

chinadns-ng/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=1
 ifeq ($(ARCH),aarch64)
   ifeq ($(BOARD),rockchip)
     PKG_ARCH:=chinadns-ng+wolfssl@aarch64-linux-musl@generic+v8a@fast+lto
-    PKG_HASH:=d907398d08a2cadd8ab5b3c6c353de572bddb87db1363a458703dd7e966ddb13
+  PKG_HASH:=f0c173d2241317004ac33cf116ff15f449a8dede67f7e38e6f21efa722d70219
   else
     PKG_ARCH:=chinadns-ng+wolfssl_noasm@aarch64-linux-musl@generic+v8a@fast+lto
   PKG_HASH:=a3706e49aa71c113710a4d28fca5f1201708feb82002c26a3c8bf6a333cbaea7

luci-app-istorepanel/Makefile

@@ -2,7 +2,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.0.2-20231208
+PKG_VERSION:=1.0.6-20240718
 PKG_RELEASE:=
 
 LUCI_TITLE:=LuCI support for 1Panel

luci-app-istorepanel/luasrc/model/cbi/istorepanel.lua

@@ -70,4 +70,7 @@ for _, val in pairs(paths) do
 end
 o.default = default_path
 
+o = s:option(Flag, "include_host", translate("Include root path"))
+o.rmempty = false
+
 return m

luci-app-istorepanel/root/usr/libexec/istorec/istorepanel.sh

@@ -12,6 +12,7 @@ do_install() {
   local username=`uci get istorepanel.@main[0].username 2>/dev/null`
   local password=`uci get istorepanel.@main[0].password 2>/dev/null`
   local ver=`uci get istorepanel.@main[0].ver 2>/dev/null`
+  local include_host=`uci get istorepanel.@main[0].include_host 2>/dev/null`
 
   if [ -z "$config" ]; then
     echo "config path is empty!"
@@ -57,6 +58,10 @@ EOF
   --dns=172.17.0.1 \
   --dns=223.5.5.5 "
 
+  if [ "$include_host" = "1" ]; then
+    cmd="$cmd -v \"/:/ahost\" "
+  fi
+
   local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
   [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
 
@@ -74,6 +79,8 @@ EOF
     docker_status=`docker ps --all -f 'name=istorepanel' --format '{{.State}}'`
     if [[ $docker_status == *running* ]]; then
       docker exec istorepanel /app/reinstall.sh
+      echo "Installed OK, waiting 10s for running"
+      sleep 10
       break;
     else
       echo "istorepanel is not running, wait..."