From 560c530e279fb8ed2a4a23ba371a83870aacb71a Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 18 Jan 2013 12:42:53 +0000
Subject: all targets: use numerically prefixed uci-defaults file names to
 better control order of execution

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35217 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../atheros/base-files/etc/uci-defaults/01_leds    | 11 ++++++
 .../atheros/base-files/etc/uci-defaults/02_network | 45 ++++++++++++++++++++++
 .../linux/atheros/base-files/etc/uci-defaults/leds | 11 ------
 .../atheros/base-files/etc/uci-defaults/network    | 45 ----------------------
 4 files changed, 56 insertions(+), 56 deletions(-)
 create mode 100644 target/linux/atheros/base-files/etc/uci-defaults/01_leds
 create mode 100644 target/linux/atheros/base-files/etc/uci-defaults/02_network
 delete mode 100644 target/linux/atheros/base-files/etc/uci-defaults/leds
 delete mode 100644 target/linux/atheros/base-files/etc/uci-defaults/network

(limited to 'target/linux/atheros/base-files/etc/uci-defaults')

diff --git a/target/linux/atheros/base-files/etc/uci-defaults/01_leds b/target/linux/atheros/base-files/etc/uci-defaults/01_leds
new file mode 100644
index 000000000..076a04bfd
--- /dev/null
+++ b/target/linux/atheros/base-files/etc/uci-defaults/01_leds
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Copyright 2012 OpenWrt.org
+#
+
+. /lib/functions/uci-defaults.sh
+
+ucidef_set_led_netdev "wlan" "wlan" "wlan" "wlan0"
+
+ucidef_commit_leds
+
+exit 0
diff --git a/target/linux/atheros/base-files/etc/uci-defaults/02_network b/target/linux/atheros/base-files/etc/uci-defaults/02_network
new file mode 100644
index 000000000..7e91e6ac2
--- /dev/null
+++ b/target/linux/atheros/base-files/etc/uci-defaults/02_network
@@ -0,0 +1,45 @@
+#!/bin/sh
+if [ -e "/sys/bus/mdio_bus/drivers/IC+ IP175C/0:00" -o \
+     -e "/sys/bus/mdio_bus/drivers/IC+ IP17xx/0:00" ] && \
+   [ -x /sbin/swconfig ];
+then
+	uci batch <<EOF
+set network.eth0=switch
+set network.eth0.name=eth0
+set network.eth0.reset=1
+set network.eth0.enable_vlan=1
+set network.eth0_1=switch_vlan
+set network.eth0_1.device=eth0
+set network.eth0_1.vlan=1
+set network.eth0_1.ports="0 1 2 3 5t"
+set network.eth0_2=switch_vlan
+set network.eth0_2.device=eth0
+set network.eth0_2.vlan=2
+set network.eth0_2.ports="4 5t"
+EOF
+	HAS_SWITCH=1
+fi
+
+if [ -n "$HAS_SWITCH" -o \
+	-e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \
+	-e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then
+	uci batch <<EOF
+set network.lan.ifname=eth0.1
+set network.wan=interface
+set network.wan.ifname=eth0.2
+set network.wan.proto=dhcp
+commit network
+EOF
+	HAS_SWITCH=1
+fi
+
+[ -z "$HAS_SWITCH" -a -d /sys/class/net/eth1 ] && {
+	uci batch <<EOF
+set network.wan=interface
+set network.wan.ifname=eth1
+set network.wan.proto=dhcp
+commit network
+EOF
+}
+
+uci commit network
diff --git a/target/linux/atheros/base-files/etc/uci-defaults/leds b/target/linux/atheros/base-files/etc/uci-defaults/leds
deleted file mode 100644
index 076a04bfd..000000000
--- a/target/linux/atheros/base-files/etc/uci-defaults/leds
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Copyright 2012 OpenWrt.org
-#
-
-. /lib/functions/uci-defaults.sh
-
-ucidef_set_led_netdev "wlan" "wlan" "wlan" "wlan0"
-
-ucidef_commit_leds
-
-exit 0
diff --git a/target/linux/atheros/base-files/etc/uci-defaults/network b/target/linux/atheros/base-files/etc/uci-defaults/network
deleted file mode 100644
index 7e91e6ac2..000000000
--- a/target/linux/atheros/base-files/etc/uci-defaults/network
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-if [ -e "/sys/bus/mdio_bus/drivers/IC+ IP175C/0:00" -o \
-     -e "/sys/bus/mdio_bus/drivers/IC+ IP17xx/0:00" ] && \
-   [ -x /sbin/swconfig ];
-then
-	uci batch <<EOF
-set network.eth0=switch
-set network.eth0.name=eth0
-set network.eth0.reset=1
-set network.eth0.enable_vlan=1
-set network.eth0_1=switch_vlan
-set network.eth0_1.device=eth0
-set network.eth0_1.vlan=1
-set network.eth0_1.ports="0 1 2 3 5t"
-set network.eth0_2=switch_vlan
-set network.eth0_2.device=eth0
-set network.eth0_2.vlan=2
-set network.eth0_2.ports="4 5t"
-EOF
-	HAS_SWITCH=1
-fi
-
-if [ -n "$HAS_SWITCH" -o \
-	-e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \
-	-e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then
-	uci batch <<EOF
-set network.lan.ifname=eth0.1
-set network.wan=interface
-set network.wan.ifname=eth0.2
-set network.wan.proto=dhcp
-commit network
-EOF
-	HAS_SWITCH=1
-fi
-
-[ -z "$HAS_SWITCH" -a -d /sys/class/net/eth1 ] && {
-	uci batch <<EOF
-set network.wan=interface
-set network.wan.ifname=eth1
-set network.wan.proto=dhcp
-commit network
-EOF
-}
-
-uci commit network
-- 
cgit v1.2.3