diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2007-03-03 20:35:01 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2007-03-03 20:35:01 +0000 |
| commit | 662fde90774af7779c542c05f9402acb4ffcb297 (patch) | |
| tree | 9eabb768e69d4881a8302a1a4b918f89be90837e /package | |
| parent | 7b0de4ae45abb18db2093cd8ebc9dd6415fc361a (diff) | |
| download | upstream-662fde90774af7779c542c05f9402acb4ffcb297.tar.gz upstream-662fde90774af7779c542c05f9402acb4ffcb297.tar.bz2 upstream-662fde90774af7779c542c05f9402acb4ffcb297.zip | |
R.I.P. devfs
SVN-Revision: 6478
Diffstat (limited to 'package')
| -rw-r--r-- | package/base-files/files/etc/inittab | 2 | ||||
| -rw-r--r-- | package/base-files/files/etc/mdev.conf | 5 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/hotplug | 2 | ||||
| -rw-r--r-- | package/busybox/Makefile | 1 | ||||
| -rw-r--r-- | package/busybox/config/miscutils/Config.in | 2 | ||||
| -rw-r--r-- | package/busybox/config/util-linux/Config.in | 4 | ||||
| -rw-r--r-- | package/busybox/target-config.in | 11 |
7 files changed, 23 insertions, 4 deletions
diff --git a/package/base-files/files/etc/inittab b/package/base-files/files/etc/inittab index 39e134cb16..3d92717c9d 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 0000000000..89355830f0 --- /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 b1b6f97b23..75d5170833 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 530b027670..3e6cc4e9c9 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 41a42c91a1..4e418893f4 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 ab3dc3731d..0f219d70e2 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 0000000000..77c58cef14 --- /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 |