Make sure initial permissions for /dev/ nodes are correct since recent udev versions...

svn-id: @12635

diff --git a/geninitrd b/geninitrd
index fe0166328ac6a6be0ea161c6141af483f6a68b60..7ee1ae683eeb4446f1008ab982f7932d1da301bf 100755 (executable)
--- a/geninitrd
+++ b/geninitrd
@@ -171,14 +171,14 @@ mount_dev() {
                : 'Creating /dev'
                if ! mount -t devtmpfs -o mode=0755,nosuid devtmpfs /dev > /dev/null 2>&1; then
                        mount -o mode=0755,nosuid -t tmpfs tmpfs /dev
-                       mknod /dev/console c 5 1
-                       mknod /dev/null c 1 3
-                       mknod /dev/zero c 1 5
-                       mknod /dev/random c 1 8
-                       mknod /dev/snapshot c 10 231
-                       mknod /dev/urandom c 1 9
-                       mknod /dev/ptmx c 5 2
-                       mknod /dev/kmsg c 1 11
+                       mknod -m 600 /dev/console c 5 1
+                       mknod -m 666 /dev/null c 1 3
+                       mknod -m 666 /dev/zero c 1 5
+                       mknod -m 666 /dev/random c 1 8
+                       mknod -m 600 /dev/snapshot c 10 231
+                       mknod -m 666 /dev/urandom c 1 9
+                       mknod -m 666 /dev/ptmx c 5 2
+                       mknod -m 644 /dev/kmsg c 1 11
                fi
                mkdir /dev/pts
                mkdir /dev/shm

diff --git a/mod-udev.sh b/mod-udev.sh
index bcc389e3d8cc3cfeee87ff32c82be063098a9584..09bcc7de9283f7dbc43b51b2cc64da79b0e2b7e9 100644 (file)
--- a/mod-udev.sh
+++ b/mod-udev.sh
@@ -110,6 +110,35 @@ initrd_gen_mdev() {
        busybox_applet mdev
        ln -s busybox $DESTDIR/bin/mdev
 
+       cat > $DESTDIR/etc/mdev.conf    <<-'EOF'
+# Provide user, group, and mode information for devices.  If a regex matches
+# the device name provided by sysfs, use the appropriate user:group and mode
+# instead of the default 0:0 660.
+#
+# Syntax:
+# %s %d:%d %s
+# devicename_regex user:group mode
+
+null           0:0 666
+zero           0:0 666
+urandom                0:0 444
+
+kmem           0:9 000
+mem            0:9 640
+port           0:9 640
+
+console                0:5 600
+ptmx           0:5 660
+tty[0-9]*      0:5 660
+
+ttyS[0-9]*     0:20 640
+
+fd[0-9]*       0:11 660
+
+sd[a-z]*       0:6 660
+hd[a-z]*       0:6 660
+       EOF
+
        mount_dev
        mount_sys
        mount_run