[PATCH] remove the %D modifier as it is not longer needed.
This commit is contained in:
parent
45d57088f9
commit
18f0045bc8
|
@ -1,17 +1,5 @@
|
||||||
# There are a number of modifiers that are allowed to be used in the NAME or PROGRAM fields.
|
# There are a number of modifiers that are allowed to be used in some of the
|
||||||
# They provide the following subsitutions:
|
# fields. See the udev man page for a full description of them.
|
||||||
# %n - the "kernel number" of the device.
|
|
||||||
# for example, 'sda3' has a "kernel number" of '3'
|
|
||||||
# %k - the kernel name for the device.
|
|
||||||
# %M - the kernel major number for the device
|
|
||||||
# %m - the kernel minor number for the device
|
|
||||||
# %b - the bus id for the device
|
|
||||||
# %c - the return value of the external PROGRAM (note, this doesn't work within
|
|
||||||
# the PROGRAM field for the obvious reason.)
|
|
||||||
# %D - use the devfs style disk name for this device.
|
|
||||||
# For partitions, this will result in 'part%n'
|
|
||||||
# If this is not a partition, it will result in 'disc'
|
|
||||||
#
|
|
||||||
|
|
||||||
# Looking for scsi bus id 42:0:0:1
|
# Looking for scsi bus id 42:0:0:1
|
||||||
BUS="scsi", PROGRAM="/bin/echo -n test-%b", RESULT="test-42:0:0:1", NAME="%c"
|
BUS="scsi", PROGRAM="/bin/echo -n test-%b", RESULT="test-42:0:0:1", NAME="%c"
|
||||||
|
|
|
@ -1,20 +1,5 @@
|
||||||
# These rules are to try to emulate a devfs naming scheme in udev
|
# There are a number of modifiers that are allowed to be used in some of the
|
||||||
# if there are any missing rules, please let the udev developers
|
# fields. See the udev man page for a full description of them.
|
||||||
# know.
|
|
||||||
#
|
|
||||||
# There are a number of modifiers that are allowed to be used in the
|
|
||||||
# a number of the different fields. They provide the following subsitutions:
|
|
||||||
# %n - the "kernel number" of the device.
|
|
||||||
# for example, 'sda3' has a "kernel number" of '3'
|
|
||||||
# %M - the kernel major number for the device
|
|
||||||
# %m - the kernel minor number for the device
|
|
||||||
# %b - the bus id for the device
|
|
||||||
# %c - the return value of the external PROGRAM (note, this doesn't work within
|
|
||||||
# the PROGRAM field for the obvious reason.)
|
|
||||||
# %D - use the devfs style disk name for this device.
|
|
||||||
# For partitions, this will result in 'part%n'
|
|
||||||
# If this is not a partition, it will result in 'disc'
|
|
||||||
#
|
|
||||||
|
|
||||||
# ide block devices
|
# ide block devices
|
||||||
BUS="ide", id="0.0", NAME="ide/host0/bus0/target0/lun0/%D"
|
BUS="ide", id="0.0", NAME="ide/host0/bus0/target0/lun0/%D"
|
||||||
|
|
10
namedev.c
10
namedev.c
|
@ -196,16 +196,6 @@ static void apply_format(struct udevice *udev, unsigned char *string)
|
||||||
strcat(pos, udev->kernel_number);
|
strcat(pos, udev->kernel_number);
|
||||||
dbg("substitute kernel number '%s'", udev->kernel_number);
|
dbg("substitute kernel number '%s'", udev->kernel_number);
|
||||||
break;
|
break;
|
||||||
case 'D':
|
|
||||||
if (strlen(udev->kernel_number) == 0) {
|
|
||||||
strcat(pos, "disc");
|
|
||||||
dbg("substitute devfs disc");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
strcat(pos, "part");
|
|
||||||
strcat(pos, udev->kernel_number);
|
|
||||||
dbg("substitute devfs part '%s'", udev->kernel_number);
|
|
||||||
break;
|
|
||||||
case 'm':
|
case 'm':
|
||||||
sprintf(pos, "%u", udev->minor);
|
sprintf(pos, "%u", udev->minor);
|
||||||
dbg("substitute minor number '%u'", udev->minor);
|
dbg("substitute minor number '%u'", udev->minor);
|
||||||
|
|
5
udev.8
5
udev.8
|
@ -197,11 +197,6 @@ returned string.
|
||||||
.B PROGRAM
|
.B PROGRAM
|
||||||
field for the obvious reason.)
|
field for the obvious reason.)
|
||||||
.TP
|
.TP
|
||||||
.B %D
|
|
||||||
Use the devfs style disk name for this device.
|
|
||||||
For partitions, this will result in 'part%n'
|
|
||||||
If this is not a partition, it will result in 'disc'.
|
|
||||||
.TP
|
|
||||||
.B %%
|
.B %%
|
||||||
The '%' char itself.
|
The '%' char itself.
|
||||||
.P
|
.P
|
||||||
|
|
Loading…
Reference in New Issue