From 9f63b7326f5cddb747ce2a9e15023df97f8db3a4 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sat, 25 Jun 2011 22:05:10 +0000
Subject: [PATCH] geos: deprecate uci-defaults files

Signed-off-by: Philip Prindeville <philipp_subx@redfish-solutions.com>

SVN-Revision: 27287
---
 .../x86/geos/base-files/etc/config/network    | 44 +++++++++++++++++++
 .../geos/base-files/etc/uci-defaults/network  | 16 -------
 .../x86/geos/base-files/etc/uci-defaults/ppp  | 23 ----------
 3 files changed, 44 insertions(+), 39 deletions(-)
 create mode 100644 target/linux/x86/geos/base-files/etc/config/network
 delete mode 100644 target/linux/x86/geos/base-files/etc/uci-defaults/network
 delete mode 100644 target/linux/x86/geos/base-files/etc/uci-defaults/ppp

diff --git a/target/linux/x86/geos/base-files/etc/config/network b/target/linux/x86/geos/base-files/etc/config/network
new file mode 100644
index 00000000000..f49838318b0
--- /dev/null
+++ b/target/linux/x86/geos/base-files/etc/config/network
@@ -0,0 +1,44 @@
+# Copyright (C) 2011 OpenWrt.org
+
+config interface loopback
+	option ifname	lo
+	option proto	static
+	option ipaddr	127.0.0.1
+	option netmask	255.0.0.0
+
+config interface lan
+	option ifname	"eth0 eth1"
+	option type 	bridge
+	option proto	static
+	option ipaddr	192.168.1.1
+	option netmask	255.255.255.0
+
+config atm-bridge
+	option unit	0
+	option atmdev	0
+	option vpi	0
+	option vci	35
+	option encaps	llc
+	option payload	bridged
+	option sendsize	2040
+
+config interface wan
+	option proto	dhcp
+	option ifname	nas0
+	# clone your eth0 address here
+	# option macaddr '00:0A:FA:22:00:80'
+
+# 2nd interface on Geos2
+#config interface wan
+#	option proto	pppoa
+#	option atmdev	1
+#	option vpi	8
+#	option vci	32
+#	option encaps	vc
+#	option username	'username@myisp.net'
+#	option password 'password'
+#	option keepalive	3
+#	option defaultroute	1
+#	option peerdns	1
+#	option pppd_options	'kdebug 1 debug noccp'
+
diff --git a/target/linux/x86/geos/base-files/etc/uci-defaults/network b/target/linux/x86/geos/base-files/etc/uci-defaults/network
deleted file mode 100644
index a30be95109c..00000000000
--- a/target/linux/x86/geos/base-files/etc/uci-defaults/network
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-uci batch <<__EOF__
-
-delete network.lan
-
-set network.lan=interface
-set network.lan.type=bridge
-set network.lan.ifname="eth0 eth1"
-set network.lan.proto=static
-set network.lan.ipaddr="192.168.1.1"
-set network.lan.netmask="255.255.255.0"
-set network.lan.nat=1
-
-commit network
-__EOF__
diff --git a/target/linux/x86/geos/base-files/etc/uci-defaults/ppp b/target/linux/x86/geos/base-files/etc/uci-defaults/ppp
deleted file mode 100644
index 58a2d8f17f8..00000000000
--- a/target/linux/x86/geos/base-files/etc/uci-defaults/ppp
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-uci batch <<__EOF__
-
-delete network.wan
-
-set network.wan=interface
-set network.wan.proto='pppoa'
-set network.wan.atmdev=0
-set network.wan.card=0
-set network.wan.vpi=0
-set network.wan.vci=32
-set network.wan.encaps='vc'
-set network.wan.username='username@myisp.net'
-set network.wan.password='password'
-set network.wan.keepalive=3
-set network.wan.defaultroute=1
-set network.wan.peerdns=1
-set network.wan.pppd_options='kdebug 1 debug noccp'
-set network.wan.auto=1
-
-commit network
-__EOF__