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

diff --git a/namedev.c b/namedev.c
index fbdb125e4c39ec28a941b46bbd9fa57f9ee47061..75e4d22370d04e72089937cf9366ae2447711a06 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -223,7 +223,7 @@ static void apply_format(struct udevice *udev, unsigned char *string)
                                break;
                        case 'D':
                                if (strlen(udev->kernel_number) == 0) {
                                break;
                        case 'D':
                                if (strlen(udev->kernel_number) == 0) {

-                                       strcat(pos, "disk");
+                                       strcat(pos, "disc");

                                        break;
                                }
                                strcat(pos, "part");
                                        break;
                                }
                                strcat(pos, "part");

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 39d8450c34a9a52075013a763cb916e9fdb87fd8..3dfbaa2530e148995ca5d2db36ca5c517d3856a2 100644 (file)
--- 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",
                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
                conf     => <<EOF
 LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="lun0/%D"
 EOF

diff --git a/udev.8 b/udev.8
index 7b4e17b5c41d1fab754f628b204eca766378e85e..d36145f43b43a28f1b90bb09b6a178d225ad1359 100644 (file)
--- a/udev.8
+++ b/udev.8
@@ -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'
 .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
 .P
 .RI "A sample " udev.rules " might look like this:"
 .sp

diff --git a/udev.rules b/udev.rules
index 3044a87b44bd83b68273f82d84eb93ca0bf43b1b..e497aed05b4d411ec167a335c452bb96c2e974cc 100644 (file)
--- 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'
 #      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
 #
 
 # Looking for scsi bus id 42:0:0:1

diff --git a/udev.rules.devfs b/udev.rules.devfs
index a92896078ccaf5cec41b698b37bf9ac50f75a34f..0d579a4dd46dffd56317c4e953324254add6e618 100644 (file)
--- 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'
 #      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
 #
 
 # ide block devices