[PATCH] remove the %D modifier as it is not longer needed.

diff --git a/etc/udev/udev.rules b/etc/udev/udev.rules
index 406a1891bd23bdaf72304c89015f0dbcb9113d7b..98d2ceccc785b6a224a5b53637f2be553f6e42fc 100644 (file)
--- a/etc/udev/udev.rules
+++ b/etc/udev/udev.rules
@@ -1,17 +1,5 @@
-# There are a number of modifiers that are allowed to be used in the NAME or PROGRAM fields.
-# They provide the following subsitutions:
-# %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'
-#
+# There are a number of modifiers that are allowed to be used in some of the
+# fields.  See the udev man page for a full description of them.
 
 # 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"

diff --git a/etc/udev/udev.rules.devfs b/etc/udev/udev.rules.devfs
index c04fc7e8ef9340228d1252cf78d5de6727d10261..6182f502bfc8ae774c2eaf007817164695c558ad 100644 (file)
--- a/etc/udev/udev.rules.devfs
+++ b/etc/udev/udev.rules.devfs
@@ -1,20 +1,5 @@
-# These rules are to try to emulate a devfs naming scheme in udev
-# if there are any missing rules, please let the udev developers
-# 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'
-#
+# There are a number of modifiers that are allowed to be used in some of the
+# fields.  See the udev man page for a full description of them.
 
 # ide block devices
 BUS="ide", id="0.0", NAME="ide/host0/bus0/target0/lun0/%D"

diff --git a/namedev.c b/namedev.c
index fdda039f5993f41a42cdd8502ea24334fa447410..b3b23521d6cf154f1554921546171ddb480809ce 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -196,16 +196,6 @@ static void apply_format(struct udevice *udev, unsigned char *string)
                                strcat(pos, udev->kernel_number);
                                dbg("substitute kernel number '%s'", udev->kernel_number);
                                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':
                                sprintf(pos, "%u", udev->minor);
                                dbg("substitute minor number '%u'", udev->minor);

diff --git a/udev.8 b/udev.8
index 1ca42982eaa07920201dbeb299a20e957b287379..0421fee4e66f9ad72e2f4e51284e54a74b540385 100644 (file)
--- a/udev.8
+++ b/udev.8
@@ -197,11 +197,6 @@ returned string.
 .B PROGRAM
 field for the obvious reason.)
 .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 %%
 The '%' char itself.
 .P