diff options
| author | greg@kroah.com <greg@kroah.com> | 2003-12-10 22:12:30 -0800 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-04-26 21:13:07 -0700 |
| commit | 525d07e78e281f5034ee29d2cd5cc144fe320431 (patch) | |
| tree | 4385c10fd1f334b578c54d51a43410515af6da9b | |
| parent | 26004fcc665d14220c5b15a15ee4b2dd5d4af314 (diff) | |
[PATCH] change devfs disk name rule from 'disk' to 'disc'
| -rw-r--r-- | namedev.c | 2 | ||||
| -rw-r--r-- | test/udev-test.pl | 2 | ||||
| -rw-r--r-- | udev.8 | 2 | ||||
| -rw-r--r-- | udev.rules | 2 | ||||
| -rw-r--r-- | udev.rules.devfs | 2 |
5 files changed, 5 insertions, 5 deletions
@@ -223,7 +223,7 @@ static void apply_format(struct udevice *udev, unsigned char *string) break; case 'D': if (strlen(udev->kernel_number) == 0) { - strcat(pos, "disk"); + strcat(pos, "disc"); break; } strcat(pos, "part"); diff --git a/test/udev-test.pl b/test/udev-test.pl index 39d8450c34..3dfbaa2530 100644 --- a/test/udev-test.pl +++ b/test/udev-test.pl @@ -156,7 +156,7 @@ EOF desc => "devfs disk naming substitution", subsys => "block", devpath => "block/sda", - expected => "lun0/disk" , + expected => "lun0/disc" , conf => <<EOF LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="lun0/%D" EOF @@ -158,7 +158,7 @@ The CALLOUT program returned string. .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 'disk'. +If this is not a partition, it will result in 'disc'. .P .RI "A sample " udev.rules " might look like this:" .sp diff --git a/udev.rules b/udev.rules index 3044a87b44..e497aed05b 100644 --- a/udev.rules +++ b/udev.rules @@ -9,7 +9,7 @@ # 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 'disk' +# If this is not a partition, it will result in 'disc' # # Looking for scsi bus id 42:0:0:1 diff --git a/udev.rules.devfs b/udev.rules.devfs index a92896078c..0d579a4dd4 100644 --- a/udev.rules.devfs +++ b/udev.rules.devfs @@ -13,7 +13,7 @@ # 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 'disk' +# If this is not a partition, it will result in 'disc' # # ide block devices |