Merge branch 'next'

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / udev

diff --git a/src/initscripts/init.d/udev b/src/initscripts/init.d/udev
index 72d1e4067147425248241b08d0e37891368cca79..6cf8771eaf745d132700feb999c4122ac9d3d7a3 100644 (file)
--- a/src/initscripts/init.d/udev
+++ b/src/initscripts/init.d/udev
@@ -17,9 +17,6 @@
 
 case "${1}" in
        start)
-               boot_mesg "Mount /var/run..."
-               mount -n -t tmpfs tmpfs /var/run -o size=2M
-
                boot_mesg "Populating /dev with device nodes..."
                if ! grep -q '[[:space:]]sysfs' /proc/mounts; then
                        echo_failure
@@ -44,6 +41,16 @@ case "${1}" in
                        /etc/rc.d/init.d/halt stop
                fi
 
+               if ! grep -q '[[:space:]]/dev/shm' /proc/mounts; then
+                       mkdir -p /dev/shm
+                       mount -t tmpfs tmpfs /dev/shm
+               fi
+
+               if ! grep -q '[[:space:]]/dev/pts' /proc/mounts; then
+                       mkdir -p /dev/pts
+                       mount -t devpts devpts -o gid=5,mode=620 /dev/pts
+               fi
+
                # Udev handles uevents itself, so we don't need to have
                # the kernel call out to any binary in response to them
                echo > /proc/sys/kernel/hotplug
@@ -57,7 +64,7 @@ case "${1}" in
 
                # Now traverse /sys in order to "coldplug" devices that have
                # already been discovered
-               /bin/udevadm trigger
+               /bin/udevadm trigger --action=add
 
                # Now wait for udevd to process the uevents we triggered
                /bin/udevadm settle