X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.8.in;h=936ec15d2a1ed77b3c49423db917ad3a3789b3f2;hb=4272779706c53c635a3fa5431a4e8791402183b4;hp=328f602e031708640023afbe938a4a39ce1b938b;hpb=3ac0326962c93f381bec325583e26f47fb7d4833;p=elogind.git

diff --git a/udev.8.in b/udev.8.in
index 328f602e0..936ec15d2 100644
--- a/udev.8.in
+++ b/udev.8.in
@@ -55,33 +55,10 @@ The name of the udev rules file or directory to look for files with the suffix
 All rule files are read in lexical order. The default value is
 .IR /etc/udev/rules.d/ .
 .TP
-.B udev_permissions
-The name of the udev permission file or directory to look for files with the
-suffix
-.IR .permissions .
-All permission files are read in lexical order. The default value is
-.IR /etc/udev/permissions.d/ .
-.TP
 .B udev_log
 The switch to enable/disable logging of udev information
 The default value is
 .IR yes .
-.TP
-.B default_mode
-The default mode for all nodes not explicitly matching in the permissions
-file. The default value is
-.IR 0666 .
-.TP
-.B default_owner
-The default owner for all nodes not explicitly matching in the permissions
-file. The default value is
-.IR root .
-.TP
-.B default_group
-The default group for all nodes not explicitly matching in the permissions
-file. The default value is
-.IR root .
-.br
 .P
 .RI "A sample " udev.conf " file might look like this:
 .sp
@@ -96,24 +73,8 @@ udev_db="/udev/.udevdb"
                for files with the suffix .rules
 udev_rules="/etc/udev/rules.d/"
 
-# udev_permissions - The name of the udev permission file or directory
-                     to look for files with the suffix .permissions
-udev_permissions="/etc/udev/udev.permissions"
-
 # udev_log - set to "yes" if you want logging, else "no"
 udev_log="yes"
-
-# default_mode - set the default mode for all nodes not
-#                explicitly matching in the permissions file
-default_mode="0666"
-
-# default_owner - set the default owner for all nodes not
-#                 explicitly matching in the permissions file
-default_owner="root"
-
-# default_group - set the default group for all nodes not
-#                 explicitly matching in the permissions file
-default_group="root"
 .fi
 .P
 The rules for device naming are read from the files located in the
@@ -184,20 +145,6 @@ call.
 .B NAME
 The name of the node to be created, or the name, the network interface
 should be renamed to.
-.br
-If given with the attribute
-.BR NAME{ all_partitions }
-.B udev
-will create device nodes for all 15 partitions of a blockdevice.
-This may be useful for removable media devices.
-.br
-If given with the attribute
-.BR NAME{ ignore_remove }
-.B udev
-will ignore any later remove event for this device.
-This may be useful as a workaround for broken device drivers.
-.sp
-Multiple attributes may be separated by comma.
 .TP
 .B SYMLINK
 The name of a symlink targeting the node. Multiple symlinks may be
@@ -214,10 +161,25 @@ separate rules file, while the device nodes are maintained by the
 distribution provided rules file.
 .TP
 .B OWNER, GROUP, MODE
-The permissions for this device. Every specified value overwrites the value
-given in the permissions file.
+The permissions for the device node. Every specified value overwrites the
+compiled-in default value.
+.TP
+.B OPTIONS
+.B ignore_device
+will ignore this device. No node will be created.
+.sp
+.B ignore_remove
+will ignore any later remove event for this device.
+This may be useful as a workaround for broken device drivers.
+.sp
+.B all_partitions
+will create device nodes for all available partitions of a blockdevice.
+This may be useful for removable media devices which do not detect a media
+change.
+.sp
+Multiple attributes may be separated by comma.
 .P
-.RB "The " NAME " ," SYMLINK " and " PROGRAM
+.RB "The " NAME ", " SYMLINK ", " PROGRAM ", " OWNER " and " GROUP
 fields support simple printf-like string substitutions:
 .TP
 .B %n
@@ -227,6 +189,9 @@ For example, 'sda3' has a "kernel number" of '3'.
 .B %k
 The "kernel name" for the device.
 .TP
+.B %p
+The devpath for the device.
+.TP
 .B %M
 The kernel major number for the device.
 .TP
@@ -250,6 +215,13 @@ If the number is followed by the + char this part plus
 all remaining parts of the result string are substituted:
 .BI %c{ N+ }
 .TP
+.B %N
+The name of a created temporary device node to provide access to the
+device from a external program.
+.TP
+.B %P
+The node name of the parent device.
+.TP
 .BI %s{ filename }
 The content of a sysfs attribute.
 .TP
@@ -299,29 +271,6 @@ KERNEL="hd[a-z]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom",
   NAME="%k", SYMLINK="cdrom%e"
 .fi
 .P
-The permissions and ownership of the created device file are read from
-the files located in the
-.I /etc/udev/permissions.d/
-directory, or at the location specified by the
-.I udev_permission
-value in the
-.I /etc/udev/udev.conf
-file.
-.br
-Every line lists a device name followed by owner, group and permission
-mode. All values are separated by colons. The name field may contain a
-pattern to apply the values to a whole class of devices.
-.sp
-.RI "A sample " udev.permissions " file might look like this:"
-.sp
-.nf
-#name:user:group:mode
-input/*:root:root:644
-ttyUSB1:0:8:0660
-video*:root:video:0660
-dsp1:::0666
-.fi
-.P
 A number of different fields in the above configuration files support a simple
 form of shell style pattern matching. It supports the following pattern characters:
 .TP