From 80221fcd2a66e6a1a4ebd79d98ae881a549fc521 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Thu, 1 Dec 2011 22:48:51 +0000 Subject: [PATCH] ramips: remove default network configuration, and generate that from uci-defaults SVN-Revision: 29387 --- target/linux/ramips/base-files.mk | 5 +++++ target/linux/ramips/base-files/etc/uci-defaults/network | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 target/linux/ramips/base-files.mk diff --git a/target/linux/ramips/base-files.mk b/target/linux/ramips/base-files.mk new file mode 100644 index 0000000000..d6682bd388 --- /dev/null +++ b/target/linux/ramips/base-files.mk @@ -0,0 +1,5 @@ +define Package/base-files/install-target + rm -f $(1)/etc/config/network +endef + + diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network index 7cb6b833a7..a00e162d01 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/network +++ b/target/linux/ramips/base-files/etc/uci-defaults/network @@ -58,8 +58,11 @@ ramips_setup_interfaces() *) RT3X5X=`cat /proc/cpuinfo | grep RT3.5` - [ -z "${RT3X5X}" ] || \ + if [ -n "${RT3X5X}" ]; then ucidef_set_interfaces_lan_wan "eth0.1 eth0.2" + else + ucidef_set_interfaces_lan_wan "eth0 eth1" + fi ;; esac } @@ -88,6 +91,10 @@ ramips_setup_macs() [ -n $wan_mac ] && ucidef_set_interface_macaddr wan $wan_mac } +[ -e /etc/config/network ] && exit 0 + +touch /etc/config/network + board=$(ramips_board_name) ramips_setup_interfaces $board -- 2.30.2