udevadm: remove symlink support for old commands

diff --git a/NEWS b/NEWS
index daefed8812b31efcd1acb63ffa76a464f7db2307..dcbf3a66b25bfcfda17e86acc58260e7c0c4864e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,9 @@ NAME="%k" causes a warning now. It's is and always was completely superfluous.
 It will break kernel supplied DEVNAMEs and therefore it needs to be removed
 from all rules.
 
 It will break kernel supplied DEVNAMEs and therefore it needs to be removed
 from all rules.
 

+Symlinks to udevadm with the old command names are no longer resolved to
+the udevadm commands.
+

 udev 146
 ========
 Bugfixes.
 udev 146
 ========
 Bugfixes.

diff --git a/TODO b/TODO
index 84bfbf372ea5c9ecf6200f9fae2e0b410b81efba..05b763efa011cc36799516c9da9a642b84eb1963 100644 (file)
--- a/TODO
+++ b/TODO
@@ -8,7 +8,6 @@
      from the name stack, they can not conflict.
   o remove most NAME= rules (they are provided by the 2.6.31 kernel)
   o convert firmware.sh to C
      from the name stack, they can not conflict.
   o remove most NAME= rules (they are provided by the 2.6.31 kernel)
   o convert firmware.sh to C

-  o symlink names to udevadm will no longer be resolved to old command names

   o "udevadm control" commands will only accept the --<command> syntax
   o get rid of braindead "scan all devices to find myself" libusb interface
       if it can not be fixed, drop libusb entirely
   o "udevadm control" commands will only accept the --<command> syntax
   o get rid of braindead "scan all devices to find myself" libusb interface
       if it can not be fixed, drop libusb entirely

diff --git a/udev/udevadm.c b/udev/udevadm.c
index b7295f32964f00f5ffce8ec7a71ff5a13bfbd6a1..452489a0c752c4087fcf52be4772cfe770e33197 100644 (file)
--- a/udev/udevadm.c
+++ b/udev/udevadm.c
@@ -131,7 +131,6 @@ int main(int argc, char *argv[])
        };
        const char *command;
        int i;
        };
        const char *command;
        int i;

-       const char *pos;

        int rc = 1;
 
        udev = udev_new();
        int rc = 1;
 
        udev = udev_new();


@@ -142,36 +141,6 @@ int main(int argc, char *argv[])
        udev_set_log_fn(udev, log_fn);
        udev_selinux_init(udev);
 
        udev_set_log_fn(udev, log_fn);
        udev_selinux_init(udev);
 

-       /* see if we are a compat link, this will be removed in a future release */
-       command = argv[0];
-       pos = strrchr(command, '/');
-       if (pos != NULL)
-               command = &pos[1];
-
-       /* the trailing part of the binary or link name is the command */
-       if (strncmp(command, "udev", 4) == 0)
-               command = &command[4];
-
-       for (i = 0; cmds[i].cmd != NULL; i++) {
-               if (strcmp(cmds[i].name, command) == 0) {
-                       char path[128];
-                       char prog[512];
-                       ssize_t len;
-
-                       snprintf(path, sizeof(path), "/proc/%lu/exe", (unsigned long) getppid());
-                       len = readlink(path, prog, sizeof(prog));
-                       if (len > 0) {
-                               prog[len] = '\0';
-                               fprintf(stderr, "the program '%s' called '%s', it should use 'udevadm %s <options>', "
-                                      "this will stop working in a future release\n", prog, argv[0], command);
-                               err(udev, "the program '%s' called '%s', it should use 'udevadm %s <options>', "
-                                   "this will stop working in a future release\n", prog, argv[0], command);
-                       }
-                       rc = run_command(udev, &cmds[i], argc, argv);
-                       goto out;
-               }
-       }
-

        while (1) {
                int option;
 
        while (1) {
                int option;