Public feed
#380130
svn st:
M target/linux/generic-2.6/files/init
D target/linux/generic-2.6/patches/000-reinstate-devfs.patch
D target/linux/generic-2.6/patches/008-mtd_uaccess.patch
A package/base-files/files/etc/mdev.conf
M package/base-files/files/etc/inittab
M package/busybox/config/util-linux/Config.in
M package/busybox/config/miscutils/Config.in
M package/busybox/Makefile
A package/busybox/target-config.in
diff (wihout the deleted patches):
Index: target/linux/generic-2.6/files/init
===================================================================
--- target/linux/generic-2.6/files/init (revision 6477)
+++ target/linux/generic-2.6/files/init (working copy)
@@ -3,9 +3,20 @@
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
mount none /proc -t proc
-mount none /dev -t devfs
-mount non /dev/pts -t devpts
+if grep devfs /proc/filesystems > /dev/null; then
+ mount none /dev -t devfs
+else
+ mount -t sysfs none /sys
+ mount -t tmpfs tmpfs /dev -o size=512K
+ mknod /dev/console c 5 1
+ mkdir /dev/pts
+ mkdir /dev/shm
+ /sbin/mdev -s
+fi
+
+mount none /dev/pts -t devpts
+
# the root mount point can come from the kernel command line
# or it can be overridden in the preinit.arch file
[ -f /etc/preinit.arch ] && . /etc/preinit.arch
Index: target/linux/generic-2.6/files/init
===================================================================
--- target/linux/generic-2.6/files/init (revision 6477)
+++ target/linux/generic-2.6/files/init (working copy)
@@ -3,9 +3,20 @@
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
mount none /proc -t proc
-mount none /dev -t devfs
-mount non /dev/pts -t devpts
+if grep devfs /proc/filesystems > /dev/null; then
+ mount none /dev -t devfs
+else
+ mount -t sysfs none /sys
+ mount -t tmpfs tmpfs /dev -o size=512K
+ mknod /dev/console c 5 1
+ mkdir /dev/pts
+ mkdir /dev/shm
+ /sbin/mdev -s
+fi
+
+mount none /dev/pts -t devpts
+
# the root mount point can come from the kernel command line
# or it can be overridden in the preinit.arch file
[ -f /etc/preinit.arch ] && . /etc/preinit.arch
Index: package/base-files/files/etc/mdev.conf
===================================================================
--- package/base-files/files/etc/mdev.conf (revision 0)
+++ package/base-files/files/etc/mdev.conf (revision 0)
@@ -0,0 +1,5 @@
+null 0:0 777
+zero 0:0 666
+console 0:5 0600
+tty 0:5 0660
+ttyS* 0:20 640
Index: package/base-files/files/etc/inittab
===================================================================
--- package/base-files/files/etc/inittab (revision 6477)
+++ package/base-files/files/etc/inittab (working copy)
@@ -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
Index: package/busybox/config/util-linux/Config.in
===================================================================
--- package/busybox/config/util-linux/Config.in (revision 6477)
+++ package/busybox/config/util-linux/Config.in (working copy)
@@ -267,7 +267,7 @@
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_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:
Index: package/busybox/config/miscutils/Config.in
===================================================================
--- package/busybox/config/miscutils/Config.in (revision 6477)
+++ package/busybox/config/miscutils/Config.in (working copy)
@@ -105,7 +105,7 @@
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..
Index: package/busybox/Makefile
===================================================================
--- package/busybox/Makefile (revision 6477)
+++ package/busybox/Makefile (working copy)
@@ -41,6 +41,7 @@
endef
define Package/busybox/config
+ source "$(SOURCE)/target-config.in"
menu "Configuration"
depends on PACKAGE_busybox
source "$(SOURCE)/config/Config.in"
Index: package/busybox/target-config.in
===================================================================
--- package/busybox/target-config.in (revision 0)
+++ package/busybox/target-config.in (revision 0)
@@ -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