From: Mike Baker <mbm@openwrt.org>
Date: Mon, 20 Mar 2006 02:18:17 +0000 (+0000)
Subject: remove sysconf
X-Git-Tag: whiterussian_rc5~38
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=377bb9daab9968d4545aafe1f47aec705f5e8453;p=openwrt%2Fsvn-archive%2Fopenwrt.git

remove sysconf

SVN-Revision: 3416
---

diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in
index b777915976..584d2aa4a2 100644
--- a/openwrt/package/Config.in
+++ b/openwrt/package/Config.in
@@ -151,6 +151,3 @@ config BR2_PACKAGE_IMAGEBUILDER
 	  Useful for building images with custom scripts or extra packages.
 
 endmenu
-
-source "package/Sysconf.in"
-
diff --git a/openwrt/package/Sysconf.in b/openwrt/package/Sysconf.in
deleted file mode 100644
index 6c0cac3cd8..0000000000
--- a/openwrt/package/Sysconf.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-
-menu "Runtime Configuration"
-	choice
-		bool "Telnet access"
-		default BR2_SYSCONF_TELNET_FAILSAFE_ONLY
-		
-		config BR2_SYSCONF_TELNET_FAILSAFE_ONLY
-			bool "open, failsafe only"
-
-		config BR2_SYSCONF_TELNET_OPEN
-			bool "open"
-
-	endchoice
-	
-	menu "Failsafe configuration"
-	
-		config BR2_SYSCONF_FAILSAFE_IP
-			string "IP Address"
-			default "192.168.1.1"
-		
-		config BR2_SYSCONF_FAILSAFE_NETMASK
-			string "Netmask"
-			default "255.255.255.0"
-
-		config BR2_SYSCONF_FAILSAFE_MAC
-			string "MAC Address"
-			default "00:00:BA:DC:0D:ED"
-
-	endmenu
-endmenu
diff --git a/openwrt/package/base-files/Makefile b/openwrt/package/base-files/Makefile
index a9426a6dcb..dcd6aa0d54 100644
--- a/openwrt/package/base-files/Makefile
+++ b/openwrt/package/base-files/Makefile
@@ -56,7 +56,6 @@ $(IPKG_BASE):
 	-find $(IDIR_BASE) -type d -name CVS | xargs rm -rf
 	-find $(IDIR_BASE) -type d -name .svn | xargs rm -rf
 	-find $(IDIR_BASE) -name '.#*' | xargs rm -f
-	-grep \^BR2_SYSCONF $(TOPDIR)/.config > $(IDIR_BASE)/etc/sysconf
 	$(IPKG_BUILD) $(IDIR_BASE) $(PACKAGE_DIR)
 
 $(IPKG_LIBC):
diff --git a/openwrt/package/base-files/default/bin/login b/openwrt/package/base-files/default/bin/login
index bb065e54a1..e6479c10d3 100755
--- a/openwrt/package/base-files/default/bin/login
+++ b/openwrt/package/base-files/default/bin/login
@@ -2,7 +2,6 @@
 . /etc/sysconf 2>&-
 
 [ "$FAILSAFE" != "true" ] &&
-[ "$BR2_SYSCONF_TELNET_FAILSAFE_ONLY" = "y" ] &&
 {
   grep '^root:[^!]' /etc/passwd >&- 2>&- &&
   {