update 2025-03-21 20:39:51

luci-app-eqosplus/Makefile

@@ -21,6 +21,14 @@ PKG_VERSION:=1.2.5
 PKG_RELEASE:=20231205
 PKG_MAINTAINER:=sirpdboy <herboy2008@gmail.com>
 
+define Build/Compile
+endef
+
+define Package/$(PKG_NAME)/postinst
+#!/bin/sh
+rm -f /tmp/luci-*
+endef
+
 define Package/$(PKG_NAME)/conffiles
 /etc/config/eqosplus
 endef

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

@@ -1,7 +1,8 @@
 -- Copyright 2022-2023 sirpdboy <herboy2008@gmail.com>
 -- Licensed to the public under the Apache License 2.0.
 local sys = require "luci.sys"
-local interfaces = sys.exec("ls -l /sys/class/net/ 2>/dev/null |awk '{print $9}' 2>/dev/null")
+local ifaces = sys.net:devices()
+local WADM = require "luci.tools.webadmin"
 local ipc = require "luci.ip"
 local a, t, e
 
@@ -21,10 +22,11 @@ ipi = t:option(ListValue, "ifname", translate("Interface"), translate("Set the i
 ipi.default = "1"
 ipi:value(1,translate("Automatic settings"))
 ipi.rmempty = false
-for interface in string.gmatch(interfaces, "%S+") do
-    if interface and interface ~= "loopback" then
-        ipi:value(interface)
-    end
+for _, v in pairs(ifaces) do
+	net = WADM.iface_get_network(v)
+	if net and net ~= "loopback" then
+		ipi:value(v)
+	end
 end
 
 t = a:section(TypedSection, "device")
@@ -39,26 +41,18 @@ e = t:option(Flag, "enable", translate("Enabled"))
 e.rmempty = false
 e.size = 4
 
-local lan_interfaces = {}
-for interface in string.gmatch(interfaces, "%S+") do
-    if string.match(interface, "lan") then
-        table.insert(lan_interfaces, interface)
-    end
-end
-
 ip = t:option(Value, "mac", translate("IP/MAC"))
-for _, lan_interface in ipairs(lan_interfaces) do
-    ipc.neighbors({family = 4, dev = lan_interface}, function(n)
-        if n.mac and n.dest then
-            ip:value(n.dest:string(), "%s (%s)" %{ n.dest:string(), n.mac })
-        end
-    end)
-    ipc.neighbors({family = 4, dev = lan_interface}, function(n)
-        if n.mac and n.dest then
-            ip:value(n.mac, "%s (%s)" %{n.mac, n.dest:string() })
-        end
-    end)
-end
+
+ipc.neighbors({family = 4, dev = "br-lan"}, function(n)
+	if n.mac and n.dest then
+		ip:value(n.dest:string(), "%s (%s)" %{ n.dest:string(), n.mac })
+	end
+end)
+ipc.neighbors({family = 4, dev = "br-lan"}, function(n)
+	if n.mac and n.dest then
+		ip:value(n.mac, "%s (%s)" %{n.mac, n.dest:string() })
+	end
+end)
 
 e.size = 8
 dl = t:option(Value, "download", translate("Downloads"))

luci-app-nekobox/htdocs/nekobox/theme.php

@@ -312,7 +312,7 @@ table.table tbody td:nth-child(2) a {
 
 .btn-close::before, 
 .btn-close::after {
-	content: "" !important;
+	content: '' !important;
 	position: absolute !important;
 	width: 12px !important;
 	height: 2px !important;

luci-app-partexp/luasrc/model/cbi/partexp/global.lua

@@ -39,6 +39,7 @@ t=m:section(TypedSection,"global")
 t.anonymous=true
 
 e=t:option(ListValue,"target_function", translate("Select function"),translate("Select the function to be performed"))
+e:value("/", translate("Used to expand to EXT4 root directory(Ext4 /)"))
 e:value("/overlay", translate("Expand application space overlay (/overlay)"))
 e:value("/opt", translate("Used as Docker data disk (/opt)"))
 e:value("/dev", translate("Normal mount and use by device name(/dev/x1)"))
@@ -55,6 +56,7 @@ end
 
 e=t:option(Flag,"keep_config",translate("Keep configuration"),translate("Tick means to retain the settings"))
 e:depends("target_function", "/overlay")
+e:depends("target_function", "/")
 e.default=0
 
 e=t:option(Flag,'auto_format', translate('Format before use'),translate("Ticking indicates formatting"))

luci-app-partexp/po/zh-cn/partexp.po

@@ -18,8 +18,8 @@ msgstr "稍等，努力执行中"
 msgid "Expand application space overlay (/overlay)"
 msgstr "用于overlay软件空间 (/overlay)"
 
-msgid "Use as root filesystem (/)"
-msgstr "用作根文件系统（/）"
+msgid "Used to expand to EXT4 root directory(Ext4 /)"
+msgstr "用于扩展为EXT4根目录(Ext4 /)"
 
 msgid "Used as Docker data disk (/opt)"
 msgstr "用作Docker数据盘 (/opt)"

luci-app-partexp/po/zh_Hans/partexp.po

@@ -18,8 +18,8 @@ msgstr "稍等，努力执行中"
 msgid "Expand application space overlay (/overlay)"
 msgstr "用于overlay软件空间 (/overlay)"
 
-msgid "Use as root filesystem (/)"
-msgstr "用作根文件系统（/）"
+msgid "Used to expand to EXT4 root directory(Ext4 /)"
+msgstr "用于扩展为EXT4根目录(Ext4 /)"
 
 msgid "Used as Docker data disk (/opt)"
 msgstr "用作Docker数据盘 (/opt)"

luci-app-partexp/root/etc/init.d/partexp

@@ -245,6 +245,8 @@ fdiskB(){
 	fi
 
 	if [ "$target_function" = "/" ] ; then
+	
+	 	if [ "$keep_config" = "1" ] ; then
 			    mkdir -p /tmp/introot
 			    mount --bind / /tmp/introot
 			    tar -C /tmp/introot -cvf - . | tar -C /mnt/$b -xf -
@@ -262,7 +264,25 @@ fdiskB(){
 			    sleep 5
 			    log "设备重启才能生效"
 			    expquit 2
+		else
+			    mkdir -p /tmp/introot
+			    mount --bind / /tmp/introot
+			    umount /tmp/introot || block umount /tmp/introot
+			    umount /mnt/$b || block umount /dev/$b   >/dev/null 2> /dev/null 
+			    block detect > /etc/config/fstab
+			    OVERLAY=`uci -q get fstab.@mount[0].target `
+			    if [ "$OVERLAY" == "/overlay" -o "$OVERLAY" == "/dev/loop0" ] ;then
+			         uci -q set fstab.@mount[0].uuid="${UUID}"
+			         uci -q set fstab.@mount[0].target='/'
+			         uci -q set fstab.@mount[0].enabled='1'
+			    fi
+			    log "保留数据根目录扩展/dev/$b成功！"
 
+			    sleep 5
+			    log "设备重启才能生效"
+			    expquit 2
+
+		fi
 	elif [ "$target_function" = "/overlay" ] ; then
 	 	if [ "$keep_config" = "1" ] ; then
 		

v2ray-geoview/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=geoview
-PKG_VERSION:=0.1.2
+PKG_VERSION:=0.1.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/snowie2000/geoview/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=f5a6a5a35540c94975c5d3c2f71256964f77c103afcafefc6f3f0e29aa18416d
+PKG_HASH:=6f7b9f80105f665d39cdbd0122f7aeadbaf6d402e10d9e66d0c8de99b8e078f7
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE