nbd's makefile/menuconfig rewrite

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@307 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 25 insertions, 5 deletions

diff --git a/target/default/target_skeleton/bin/login b/target/default/target_skeleton/bin/login
index 75208248d8..bf06359dee 100755
--- a/target/default/target_skeleton/bin/login
+++ b/target/default/target_skeleton/bin/login
@@ -1,2 +1,11 @@
 #!/bin/sh
-exec ash --login
+[ "$FAILSAFE" = "true" ] && exec /bin/ash --login
+
+[ -f /etc/sysconf ] && . /etc/sysconf
+
+if [ "$BR2_SYSCONF_TELNET_FAILSAFE_ONLY" = "y" ]; then
+	echo "Login failed."
+	exit 0
+fi
+
+exec /bin/ash --login
diff --git a/target/default/target_skeleton/etc/init.d/S10boot b/target/default/target_skeleton/etc/init.d/S10boot
index 81379bed4b..bd94bbd458 100755
--- a/target/default/target_skeleton/etc/init.d/S10boot
+++ b/target/default/target_skeleton/etc/init.d/S10boot
@@ -4,7 +4,12 @@ syslogd -C 16
 sysctl -p
 echo "S" > /proc/jffs2_bbc
 
+rm -rf /var
+ln -sf /tmp /var
 mkdir -p /var/run
+mkdir -p /var/log
+touch /var/log/wtmp
+touch /var/log/lastlog
 
 [ "$(nvram get il0macaddr)" = "00:90:4c:5f:00:2a" ] && {
   # if default wifi mac, set two higher than the lan mac
diff --git a/target/default/target_skeleton/etc/nvram.overrides b/target/default/target_skeleton/etc/nvram.overrides
index addfedd257..206c90b0dd 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"
 }
diff --git a/target/default/target_skeleton/etc/preinit b/target/default/target_skeleton/etc/preinit
index 6507d2319c..c6ad0d7065 100755
--- a/target/default/target_skeleton/etc/preinit
+++ b/target/default/target_skeleton/etc/preinit
@@ -8,7 +8,7 @@ if [ $(cat /proc/sys/reset) = 1 ] ; then
   while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done &
 else
   mount | grep jffs2 >&-
-  if [ $? = 0 ] ; then 
+  if [ $? = 0 ] ; then
     mtd unlock rootfs
     [ $(cat /proc/mtd | wc -l) = 6 ] && {
       echo 5 > /proc/sys/diag
@@ -27,4 +27,6 @@ else
   fi
 fi
 mount none /tmp -t ramfs
+mkdir -p /dev/pts
+mount none /dev/pts -t devpts
 exec /sbin/init
diff --git a/target/default/target_skeleton/etc/shells b/target/default/target_skeleton/etc/shells
new file mode 100644
index 0000000000..006aa38ced
--- /dev/null
+++ b/target/default/target_skeleton/etc/shells
@@ -0,0 +1 @@
+/bin/ash