From c559471a73bd912c756b8388eaaf71a53f2b1e30 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Thu, 30 Nov 2023 17:31:32 +0800
Subject: [PATCH] default-settings: move anon_mout setting to automount

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 0b13de911608f96596ffe36c1410b10f9092c73a)
---
 package/emortal/automount/Makefile             |  3 +++
 package/emortal/automount/files/11-anonmount   | 13 +++++++++++++
 .../default-settings/files/99-default-settings | 18 ++++++------------
 .../emortal/ipv6-helper/files/60-ipv6-hybrid   | 16 +++++++++-------
 4 files changed, 31 insertions(+), 19 deletions(-)
 create mode 100644 package/emortal/automount/files/11-anonmount

diff --git a/package/emortal/automount/Makefile b/package/emortal/automount/Makefile
index bcaca1182c..a7c5a20055 100644
--- a/package/emortal/automount/Makefile
+++ b/package/emortal/automount/Makefile
@@ -47,6 +47,9 @@ define Build/Compile
 endef
 
 define Package/automount/install
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files/11-anonmount $(1)/etc/uci-defaults/
+
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/block
 	$(INSTALL_BIN) ./files/15-automount $(1)/etc/hotplug.d/block/
 endef
diff --git a/package/emortal/automount/files/11-anonmount b/package/emortal/automount/files/11-anonmount
new file mode 100644
index 0000000000..552e57ce3e
--- /dev/null
+++ b/package/emortal/automount/files/11-anonmount
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if ! uci -q get system.@imm_init[0].anon_mount > "/dev/null"; then
+	uci -q batch <<-EOF
+		set fstab.@global[0].anon_mount="1"
+		commit fstab
+
+		set system.@imm_init[0].anon_mount="1"
+		commit system
+	EOF
+fi
+
+exit 0
diff --git a/package/emortal/default-settings/files/99-default-settings b/package/emortal/default-settings/files/99-default-settings
index 6287e78787..8cf2dbac69 100755
--- a/package/emortal/default-settings/files/99-default-settings
+++ b/package/emortal/default-settings/files/99-default-settings
@@ -3,19 +3,13 @@
 uci -q get system.@imm_init[0] > "/dev/null" || uci -q add system imm_init > "/dev/null"
 
 if ! uci -q get system.@imm_init[0].lang > "/dev/null"; then
-	uci -q set luci.main.lang="auto"
-	uci -q commit luci
+	uci -q batch <<-EOF
+		set luci.main.lang="auto"
+		commit luci
 
-	uci -q set system.@imm_init[0].lang="1"
-	uci -q commit system
-fi
-
-if ! uci -q get system.@imm_init[0].anon_mount > "/dev/null"; then
-	uci -q set fstab.@global[0].anon_mount="1"
-	uci -q commit fstab
-
-	uci -q set system.@imm_init[0].anon_mount="1"
-	uci -q commit system
+		set system.@imm_init[0].lang="1"
+		commit system
+	EOF
 fi
 
 ln -sf "/sbin/ip" "/usr/bin/ip"
diff --git a/package/emortal/ipv6-helper/files/60-ipv6-hybrid b/package/emortal/ipv6-helper/files/60-ipv6-hybrid
index 40efd986f5..72133a3a96 100755
--- a/package/emortal/ipv6-helper/files/60-ipv6-hybrid
+++ b/package/emortal/ipv6-helper/files/60-ipv6-hybrid
@@ -3,13 +3,15 @@
 uci -q get system.@imm_init[0] > "/dev/null" || uci -q add system imm_init > "/dev/null"
 uci -q get system.@imm_init[0].ipv6 > "/dev/null" && exit 0
 
-uci -q set dhcp.lan.ra="hybrid"
-uci -q set dhcp.lan.ndp="hybrid"
-uci -q set dhcp.lan.dhcpv6="hybrid"
-uci -q set dhcp.lan.ra_management="1"
-uci -q commit dhcp
+uci -q batch <<-EOF
+	set dhcp.lan.ra="hybrid"
+	set dhcp.lan.ndp="hybrid"
+	set dhcp.lan.dhcpv6="hybrid"
+	set dhcp.lan.ra_management="1"
+	commit dhcp
 
-uci -q set system.@imm_init[0].ipv6="1"
-uci -q commit system
+	set system.@imm_init[0].ipv6="1"
+	commit system
+EOF
 
 exit 0