From: greg@kroah.com <greg@kroah.com>
Date: Thu, 11 Dec 2003 06:12:30 +0000 (-0800)
Subject: [PATCH] change devfs disk name rule from 'disk' to 'disc'
X-Git-Tag: 009~19
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=525d07e78e281f5034ee29d2cd5cc144fe320431

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

diff --git a/namedev.c b/namedev.c
index fbdb125e4..75e4d2237 100644
--- 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) {
-					strcat(pos, "disk");
+					strcat(pos, "disc");
 					break;
 				}
 				strcat(pos, "part");
diff --git a/test/udev-test.pl b/test/udev-test.pl
index 39d8450c3..3dfbaa253 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
diff --git a/udev.8 b/udev.8
index 7b4e17b5c..d36145f43 100644
--- 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'
-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 3044a87b4..e497aed05 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 a92896078..0d579a4dd 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