From e157cc5c53cd2e4eefdd83328da7b322d92b7eea Mon Sep 17 00:00:00 2001
From: actions-user <kenzok8@users.noreply.github.com>
Date: Thu, 21 Nov 2024 02:10:23 +0800
Subject: [PATCH] update 2024-11-21 02:10:23

---
 quickstart/Makefile                     | 11 ++++++++---
 quickstart/files/dhcpvalid.sh           |  4 ++++
 quickstart/files/quickstart.uci-default |  2 ++
 quickstart/files/startdhns.hotplug      |  9 +++++++++
 quickstart/files/startdhns.init         | 13 +++++++++++++
 5 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100755 quickstart/files/dhcpvalid.sh
 create mode 100644 quickstart/files/startdhns.hotplug
 create mode 100755 quickstart/files/startdhns.init

diff --git a/quickstart/Makefile b/quickstart/Makefile
index ef5c80f5..e31a2007 100644
--- a/quickstart/Makefile
+++ b/quickstart/Makefile
@@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk
 PKG_ARCH_quickstart:=$(ARCH)
 
 PKG_NAME:=quickstart
-PKG_VERSION:=0.9.3
+PKG_VERSION:=0.9.4
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/linkease/istore-packages/releases/download/prebuilt/
-PKG_HASH:=1f5bc06098413a4cd30f3ba864e11d1214aa0ae782716911372cac1cf8845bf9
+PKG_HASH:=11da47a32c15dffcf44ee04e2156dc305b8354985bf1551b24d735fe56777c0b
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION)
 
@@ -57,12 +57,17 @@ define Build/Compile
 endef
 
 define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/uci-defaults $(1)/etc/hotplug.d/block $(1)/etc/config
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/uci-defaults $(1)/etc/hotplug.d/block $(1)/etc/config $(1)/usr/libexec/quickstart
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/quickstart.$(PKG_ARCH_quickstart) $(1)/usr/sbin/quickstart
 	$(INSTALL_BIN) ./files/quickstart.init $(1)/etc/init.d/quickstart
 	$(INSTALL_BIN) ./files/quickstart.uci-default $(1)/etc/uci-defaults/09-quickstart
 	$(INSTALL_BIN) ./files/quickstart.hotplug $(1)/etc/hotplug.d/block/09-quickstart
 	$(INSTALL_CONF) ./files/quickstart.config $(1)/etc/config/quickstart
+	$(INSTALL_BIN) ./files/dhcpvalid.sh $(1)/usr/libexec/quickstart/dhcpvalid.sh
+	$(INSTALL_BIN) ./files/startdhns.init $(1)/etc/init.d/startdhns
+	$(LN) /usr/sbin/quickstart $(1)/usr/sbin/startdhns
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_BIN) ./files/startdhns.hotplug $(1)/etc/hotplug.d/iface/21-startdhns
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/quickstart/files/dhcpvalid.sh b/quickstart/files/dhcpvalid.sh
new file mode 100755
index 00000000..d262aab7
--- /dev/null
+++ b/quickstart/files/dhcpvalid.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/usr/sbin/quickstart dhcpValid
+
diff --git a/quickstart/files/quickstart.uci-default b/quickstart/files/quickstart.uci-default
index 2d0abf8b..7f5e2aeb 100644
--- a/quickstart/files/quickstart.uci-default
+++ b/quickstart/files/quickstart.uci-default
@@ -3,6 +3,8 @@
 if [ "$PKG_UPGRADE" = 1 ]; then
     /etc/init.d/quickstart enable
     /etc/init.d/quickstart start
+    /etc/init.d/startdhns enable
+    /etc/init.d/startdhns boot
 fi
 
 exit 0
diff --git a/quickstart/files/startdhns.hotplug b/quickstart/files/startdhns.hotplug
new file mode 100644
index 00000000..bee2fb84
--- /dev/null
+++ b/quickstart/files/startdhns.hotplug
@@ -0,0 +1,9 @@
+[ "$INTERFACE" = "planb" -o "$INTERFACE" = "wan" ] || exit 0
+
+if [ "$ACTION" = "ifup" -o "$ACTION" = "ifupdate" ]; then
+    /usr/sbin/quickstart ifaceEvent up "$INTERFACE"
+fi
+
+if [ "$ACTION" = "ifdown" ]; then
+    /usr/sbin/quickstart ifaceEvent down "$INTERFACE"
+fi
diff --git a/quickstart/files/startdhns.init b/quickstart/files/startdhns.init
new file mode 100755
index 00000000..8ba5dd60
--- /dev/null
+++ b/quickstart/files/startdhns.init
@@ -0,0 +1,13 @@
+#!/bin/sh /etc/rc.common
+
+START=93
+USE_PROCD=1
+
+start_service() {
+	/usr/sbin/quickstart uciChange
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger network
+}