picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[PATCH] change devfs disk name rule from 'disk' to 'disc'

This commit is contained in:
greg@kroah.com 2003-12-10 22:12:30 -08:00 committed by Greg KH
parent 26004fcc66
commit 525d07e78e
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
namedev.c
View File

@ -223,7 +223,7 @@ static void apply_format(struct udevice *udev, unsigned char *string)
break; break;
case 'D': case 'D':
if (strlen(udev->kernel_number) == 0) { if (strlen(udev->kernel_number) == 0) {
strcat(pos, "disk"); strcat(pos, "disc");
break; break;
} }
strcat(pos, "part"); strcat(pos, "part");

2
test/udev-test.pl
View File

@ -156,7 +156,7 @@ EOF
desc => "devfs disk naming substitution", desc => "devfs disk naming substitution",
subsys => "block", subsys => "block",
devpath => "block/sda", devpath => "block/sda",
expected => "lun0/disk" , expected => "lun0/disc" ,
conf => <<EOF conf => <<EOF
LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="lun0/%D" LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="lun0/%D"
EOF EOF

2
udev.8
View File

@ -158,7 +158,7 @@ The CALLOUT program returned string.
.B %D .B %D
Use the devfs style disk name for this device. Use the devfs style disk name for this device.
For partitions, this will result in 'part%n' For partitions, this will result in 'part%n'
If this is not a partition, it will result in 'disk'. If this is not a partition, it will result in 'disc'.
.P .P
.RI "A sample " udev.rules " might look like this:" .RI "A sample " udev.rules " might look like this:"
.sp .sp

2
udev.rules
View File

@ -9,7 +9,7 @@
# the PROGRAM field for the obvious reason.) # the PROGRAM field for the obvious reason.)
# %D - use the devfs style disk name for this device. # %D - use the devfs style disk name for this device.
# For partitions, this will result in 'part%n' # For partitions, this will result in 'part%n'
# If this is not a partition, it will result in 'disk' # 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

2
udev.rules.devfs
View File

@ -13,7 +13,7 @@
# the PROGRAM field for the obvious reason.) # the PROGRAM field for the obvious reason.)
# %D - use the devfs style disk name for this device. # %D - use the devfs style disk name for this device.
# For partitions, this will result in 'part%n' # For partitions, this will result in 'part%n'
# If this is not a partition, it will result in 'disk' # If this is not a partition, it will result in 'disc'
# #
# ide block devices # ide block devices