diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-10-14 19:46:40 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-10-14 19:46:40 +0000 |
| commit | 73246d2f646eec821ad59a2c9177ac3e0b2e75fd (patch) | |
| tree | 1b51c62e56fe44271e0f62dc657c82faca2e96a5 /target/linux/kirkwood/base-files | |
| parent | 4da854bcd00842894558aba10b3521d7171ba1e3 (diff) | |
| download | master-31e0f0ae-73246d2f646eec821ad59a2c9177ac3e0b2e75fd.tar.gz master-31e0f0ae-73246d2f646eec821ad59a2c9177ac3e0b2e75fd.tar.bz2 master-31e0f0ae-73246d2f646eec821ad59a2c9177ac3e0b2e75fd.zip | |
kirkwood: upgrade to 3.10.15
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 38402
Diffstat (limited to 'target/linux/kirkwood/base-files')
3 files changed, 8 insertions, 21 deletions
diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds b/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds index 18ac43c86a..7e2018853a 100644 --- a/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds +++ b/target/linux/kirkwood/base-files/etc/uci-defaults/01_leds @@ -1,19 +1,15 @@ #!/bin/sh # -# Copyright (C) 2012 OpenWrt.org +# Copyright (C) 2012-2013 OpenWrt.org # . /lib/functions/uci-defaults.sh -. /lib/kirkwood.sh -hardware=$(kirkwood_hardware_name) - -case "$hardware" in +case "`cat /proc/device-tree/model`" in "Seagate FreeAgent DockStar") ucidef_set_led_netdev "eth0" "dockstar:orange:misc" "eth0" ucidef_set_led_default "health" "dockstar:green:health" "1" ;; - *) ;; esac diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network index 8c04fdbf28..42724ef706 100644 --- a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network +++ b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network @@ -1,10 +1,12 @@ #!/bin/sh # -# Copyright (C) 2012 OpenWrt.org +# Copyright (C) 2012-2013 OpenWrt.org # [ -e /etc/config/network ] && exit 0 +touch /etc/config/network + set_lan_dhcp() { local ifname=$1 uci batch <<EOF @@ -19,23 +21,17 @@ EOF } . /lib/functions/uci-defaults.sh -. /lib/kirkwood.sh - -touch /etc/config/network ucidef_set_interface_loopback -hardware=$(kirkwood_hardware_name) - -case "$hardware" in -"Seagate FreeAgent DockStar") +case "`cat /proc/device-tree/model`" in +"Seagate FreeAgent Dockstar") set_lan_dhcp "eth0" ;; -"RaidSonic ICY BOX IB-NAS6210") +"RaidSonic ICY BOX IB-NAS62x0 (Rev B)") set_lan_dhcp "eth0" ;; - *) ucidef_set_interface_lan "eth0" ;; diff --git a/target/linux/kirkwood/base-files/lib/kirkwood.sh b/target/linux/kirkwood/base-files/lib/kirkwood.sh deleted file mode 100644 index 4fcd760778..0000000000 --- a/target/linux/kirkwood/base-files/lib/kirkwood.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -kirkwood_hardware_name() { - grep ^Hardware /proc/cpuinfo | sed "s/Hardware.*: \(.*\)/\1/g" -} |