R.I.P. devfs

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

7 files changed, 23 insertions, 4 deletions

diff --git a/package/base-files/files/etc/inittab b/package/base-files/files/etc/inittab
index 39e134cb1..3d92717c9 100644
--- a/package/base-files/files/etc/inittab
+++ b/package/base-files/files/etc/inittab
@@ -1,3 +1,3 @@
 ::sysinit:/etc/init.d/rcS
 tts/0::askfirst:/bin/ash --login
-#tts/1::askfirst:/bin/ash --login
+ttyS0::askfirst:/bin/ash --login
diff --git a/package/base-files/files/etc/mdev.conf b/package/base-files/files/etc/mdev.conf
new file mode 100644
index 000000000..89355830f
--- /dev/null
+++ b/package/base-files/files/etc/mdev.conf
@@ -0,0 +1,5 @@
+null 0:0 777
+zero 0:0 666
+console 0:5 0600
+tty 0:5 0660
+ttyS* 0:20 640
diff --git a/package/base-files/files/sbin/hotplug b/package/base-files/files/sbin/hotplug
index b1b6f97b2..75d517083 100755
--- a/package/base-files/files/sbin/hotplug
+++ b/package/base-files/files/sbin/hotplug
@@ -1,6 +1,8 @@
 #!/bin/sh
 # Copyright (C) 2006 OpenWrt.org
 
+[ -x /sbin/mdev ] && /sbin/mdev "$@"
+
 # bypass the normal hotplug path for firmware loading
 # would otherwise cause problems with drivers like bcm43xx
 [ "$1" = "firmware" -a "$ACTION" = "add" ] && {
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 530b02767..3e6cc4e9c 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -41,6 +41,7 @@ The Swiss Army Knife of embedded Linux.
 endef
 
 define Package/busybox/config
+	source "$(SOURCE)/target-config.in"
 	menu "Configuration"
 		depends on PACKAGE_busybox
 		source "$(SOURCE)/config/Config.in"
diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index 41a42c91a..4e418893f 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -105,7 +105,7 @@ config BUSYBOX_CONFIG_DEVFSD_VERBOSE
 
 config BUSYBOX_CONFIG_FEATURE_DEVFS
 	bool "  Use devfs names for all devices (obsolete)"
-	default y
+	default n
 	help
 	  This is obsolete and will be going away at the end of 2008..
 
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index ab3dc3731..0f219d70e 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -267,7 +267,7 @@ config BUSYBOX_CONFIG_LOSETUP
 
 config BUSYBOX_CONFIG_MDEV
 	bool "mdev"
-	default n
+	default y
 	help
 	  mdev is a mini-udev implementation: call it with -s to populate
 	  /dev from /sys, then "echo /sbin/mdev > /proc/sys/kernel/hotplug" to
@@ -276,7 +276,7 @@ config BUSYBOX_CONFIG_MDEV
 
 config BUSYBOX_CONFIG_FEATURE_MDEV_CONF
 	bool "Support /etc/mdev.conf"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_MDEV
 	help
 	  The mdev config file contains lines that look like:
diff --git a/package/busybox/target-config.in b/package/busybox/target-config.in
new file mode 100644
index 000000000..77c58cef1
--- /dev/null
+++ b/package/busybox/target-config.in
@@ -0,0 +1,11 @@
+config BUSYBOX_CONFIG_FEATURE_DEVFS
+	default y if LINUX_2_4
+	default n if LINUX_2_6
+
+config BUSYBOX_CONFIG_MDEV
+	default n if LINUX_2_4
+	default y if LINUX_2_6
+
+config BUSYBOX_CONFIG_FEATURE_MDEV_CONF
+	default n if LINUX_2_4
+	default y if LINUX_2_6