refactor: split network to two module

cause some use do not want modify lan ip and PPPoE at same time
EkkoG · Oct 11, 2024 · a8a4745 · a8a4745
1 parent 9bc1dc6
commit a8a4745
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/build.sh b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-default_modules="add-all-device-to-lan add-feed-key add-feed ib argon base network opkg-mirror prefer-ipv6-settings statistics system tools"
+default_modules="add-all-device-to-lan add-feed-key add-feed ib argon base opkg-mirror prefer-ipv6-settings statistics system tools"
 
 echo "Default modules: $default_modules"
 

diff --git a/modules/lan/example.env b/modules/lan/example.env
@@ -0,0 +1 @@
+LAN_IP=192.168.2.1
diff --git a/modules/lan/files/etc/uci-defaults/89-network b/modules/lan/files/etc/uci-defaults/89-network
@@ -0,0 +1,7 @@
+
+uci batch << EOF
+
+set network.lan.ipaddr='$LAN_IP'
+
+commit
+EOF
diff --git a/modules/network/example.env b/modules/network/example.env
diff --git a/modules/pppoe/example.env b/modules/pppoe/example.env
@@ -0,0 +1,2 @@
+PPPOE_USERNAME=
+PPPOE_PASSWORD=
diff --git a/...network/files/etc/uci-defaults/89-network → ...s/pppoe/files/etc/uci-defaults/89-network b/...network/files/etc/uci-defaults/89-network → ...s/pppoe/files/etc/uci-defaults/89-network
@@ -5,10 +5,3 @@ set network.wan.password='$PPPOE_PASSWORD'
 
 commit
 EOF
-
-uci batch << EOF
-
-set network.lan.ipaddr='$LAN_IP'
-
-commit
-EOF
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,10 +5,3 @@ set network.wan.password='$PPPOE_PASSWORD' @@
     commit
     EOF
-    uci batch << EOF
-    set network.lan.ipaddr='$LAN_IP'
-    commit
-    EOF