diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2011-12-01 22:48:51 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2011-12-01 22:48:51 +0000 |
| commit | 0aaf068e514ab0f6e52ac116a1ea234d304e9882 (patch) | |
| tree | 353d6758019ef27c140a93248ebb53eb5b3d0461 /target | |
| parent | cebe9384faa01cc1b638d8eecbb0d7673786d553 (diff) | |
| download | upstream-0aaf068e514ab0f6e52ac116a1ea234d304e9882.tar.gz upstream-0aaf068e514ab0f6e52ac116a1ea234d304e9882.tar.bz2 upstream-0aaf068e514ab0f6e52ac116a1ea234d304e9882.zip | |
ramips: remove default network configuration, and generate that from uci-defaults
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29387 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/ramips/base-files.mk | 5 | ||||
| -rwxr-xr-x | target/linux/ramips/base-files/etc/uci-defaults/network | 9 |
2 files changed, 13 insertions, 1 deletions
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 |