From 86792b320ef827cd145ad9635c48e5165f33587c Mon Sep 17 00:00:00 2001 From: lseys Date: Wed, 9 Aug 2023 14:52:19 +0200 Subject: [PATCH] fix: clear default configuration by setting only requires --- install/bananapi.mk | 2 -- misc/bpi-r3/uci/network | 50 +++++++++++++++------------------------- misc/bpi-r3/uci/system | 15 ------------ misc/bpi-r3/uci/wireless | 29 ----------------------- 4 files changed, 18 insertions(+), 78 deletions(-) delete mode 100644 misc/bpi-r3/uci/system delete mode 100644 misc/bpi-r3/uci/wireless diff --git a/install/bananapi.mk b/install/bananapi.mk index bd0a3fd..32f596b 100644 --- a/install/bananapi.mk +++ b/install/bananapi.mk @@ -1,5 +1,3 @@ install-bpi-r3-network-config: mkdir -p files/etc/config cp misc/bpi-r3/uci/network files/etc/config/network -# cp misc/bpi-r3/uci/wireless files/etc/config/wireless -# cp misc/bpi-r3/uci/system files/etc/config/system \ No newline at end of file diff --git a/misc/bpi-r3/uci/network b/misc/bpi-r3/uci/network index 1492e5a..951e1f0 100644 --- a/misc/bpi-r3/uci/network +++ b/misc/bpi-r3/uci/network @@ -1,38 +1,24 @@ +config interface 'lan' + option type 'bridge' + option proto 'static' + option ipaddr '192.168.1.1' + option netmask '255.255.255.0' + list ports 'lan1' + list ports 'lan2' + list ports 'lan3' + list ports 'lan4' + list ports 'sfp2' + option ip6assign '60' + +config interface 'wan' + option type 'bridge' + list ports 'eth1' + list ports 'wan' + option proto 'dhcp' + config device config interface 'loopback' option device 'lo' option proto 'static' option ipaddr '127.0.0.1' option netmask '255.0.0.0' - -config device - option name 'br-lan' - option type 'bridge' - list ports 'lan1' - list ports 'lan2' - list ports 'lan3' - list ports 'lan4' - list ports 'sfp2' - -config interface 'lan' - option device 'br-lan' - option proto 'static' - option ipaddr '192.168.1.1' - option netmask '255.255.255.0' - option ip6assign '60' - -config device - option name 'br-wan' - option type 'bridge' - list ports 'eth1' - list ports 'wan' - -config device - option name 'eth1' - -config device - option name 'wan' - -config interface 'wan' - option device 'br-wan' - option proto 'dhcp' diff --git a/misc/bpi-r3/uci/system b/misc/bpi-r3/uci/system deleted file mode 100644 index 35089e6..0000000 --- a/misc/bpi-r3/uci/system +++ /dev/null @@ -1,15 +0,0 @@ -config system - option hostname 'OpenWrt' - option timezone 'UTC' - option ttylogin '0' - option log_size '64' - option urandom_seed '0' - option compat_version '1.1' - -config timeserver 'ntp' - option enabled '1' - option enable_server '0' - list server '0.openwrt.pool.ntp.org' - list server '1.openwrt.pool.ntp.org' - list server '2.openwrt.pool.ntp.org' - list server '3.openwrt.pool.ntp.org' diff --git a/misc/bpi-r3/uci/wireless b/misc/bpi-r3/uci/wireless deleted file mode 100644 index 3c3f79b..0000000 --- a/misc/bpi-r3/uci/wireless +++ /dev/null @@ -1,29 +0,0 @@ -config wifi-device 'radio0' - option type 'mac80211' - option path 'platform/soc/18000000.wifi' - option channel '1' - option band '2g' - option htmode 'HE20' - option disabled '1' - -config wifi-iface 'default_radio0' - option device 'radio0' - option network 'lan' - option mode 'ap' - option ssid 'OpenWrt' - option encryption 'none' - -config wifi-device 'radio1' - option type 'mac80211' - option path 'platform/soc/18000000.wifi+1' - option channel '36' - option band '5g' - option htmode 'HE80' - option disabled '1' - -config wifi-iface 'default_radio1' - option device 'radio1' - option network 'lan' - option mode 'ap' - option ssid 'OpenWrt' - option encryption 'none'