Verified Commit 24e55799 authored by Karel Koci's avatar Karel Koci 🤘
Browse files

Merge branch 'hotfix/dhcp' into hbl

parents a01293a1 02f1052c
Pipeline #78744 passed with stages
in 22 minutes and 7 seconds
From e208044a7414f2e2a66b0a6bb9b576461d0a2861 Mon Sep 17 00:00:00 2001
From 4470e977bee202fef5b95bad3224b1f5fa7dbd78 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Sun, 22 Sep 2019 22:17:29 +0200
Subject: [PATCH] base-files: Do not setup dhcp on WAN by default
To force people to the wizard to set password.
---
package/base-files/files/lib/functions/uci-defaults.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
package/base-files/files/lib/functions/uci-defaults.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh
index c2c6dc3..59182df 100755
index 2fb7555..3f4cb48 100755
--- a/package/base-files/files/lib/functions/uci-defaults.sh
+++ b/package/base-files/files/lib/functions/uci-defaults.sh
@@ -47,7 +47,7 @@ ucidef_set_interface() {
......@@ -21,6 +21,15 @@ index c2c6dc3..59182df 100755
*) json_add_string protocol none ;;
esac
fi
@@ -73,7 +73,7 @@ ucidef_set_interface_lan() {
}
ucidef_set_interface_wan() {
- ucidef_set_interface "wan" ifname "$1" protocol "${2:-dhcp}"
+ ucidef_set_interface "wan" ifname "$1" protocol "${2:-none}"
}
ucidef_set_interfaces_lan_wan() {
--
2.23.0
2.30.2
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment