From f77b88d124ea1c900f9cf5e04046939aad48bbe1 Mon Sep 17 00:00:00 2001 From: mbm Date: Sun, 6 Mar 2005 03:34:52 +0000 Subject: nbd's makefile/menuconfig rewrite git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@307 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/default/target_skeleton/etc/nvram.overrides | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'target/default/target_skeleton/etc/nvram.overrides') diff --git a/target/default/target_skeleton/etc/nvram.overrides b/target/default/target_skeleton/etc/nvram.overrides index addfedd25..206c90b0d 100644 --- a/target/default/target_skeleton/etc/nvram.overrides +++ b/target/default/target_skeleton/etc/nvram.overrides @@ -3,6 +3,9 @@ # This file handles the NVRAM quirks of various hardware. # THIS FILE IS NOT A REPLACEMENT FOR NVRAM +# Load sysconf defaults +[ -f /etc/sysconf ] && . /etc/sysconf + [ "$(nvram get boardnum)" = "asusX" ] && \ [ "$(nvram get boardtype)" = "bcm94710dev" ] && { asus=1 @@ -67,9 +70,9 @@ NVRAM_lan_proto="static" echo "### YOU ARE IN FAILSAFE MODE ####" NVRAM_lan_ifname="br0" NVRAM_lan_ifnames=${FAILSAFE_ifnames:-"vlan0 vlan1 eth1"} - NVRAM_lan_ipaddr="192.168.1.1" - NVRAM_lan_netmask="255.255.255.0" - NVRAM_lan_hwaddr="00:0B:AD:0A:DD:00" + NVRAM_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"} + NVRAM_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"} + NVRAM_lan_hwaddr=${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"} NVRAM_wan_ifname="none" NVRAM_wifi_ifname="none" } -- cgit v1.2.3