shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

udevadm: remove symlink support for old commands

Browse Source
This commit is contained in:
Kay Sievers 2009-09-06 17:24:26 +02:00
parent 9dae0e89b9
commit 6d837a5348
3 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -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 It will break kernel supplied DEVNAMEs and therefore it needs to be removed
from all rules. from all rules.
Symlinks to udevadm with the old command names are no longer resolved to
the udevadm commands.
udev 146 udev 146
======== ========
Bugfixes. Bugfixes.

1
TODO
View File

@ -8,7 +8,6 @@
from the name stack, they can not conflict. from the name stack, they can not conflict.
o remove most NAME= rules (they are provided by the 2.6.31 kernel) o remove most NAME= rules (they are provided by the 2.6.31 kernel)
o convert firmware.sh to C 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 "udevadm control" commands will only accept the --<command> syntax
o get rid of braindead "scan all devices to find myself" libusb interface o get rid of braindead "scan all devices to find myself" libusb interface
if it can not be fixed, drop libusb entirely if it can not be fixed, drop libusb entirely

31
udev/udevadm.c
View File

@ -131,7 +131,6 @@ int main(int argc, char *argv[])
}; };
const char *command; const char *command;
int i; int i;
const char *pos;
int rc = 1; int rc = 1;
udev = udev_new(); udev = udev_new();
@ -142,36 +141,6 @@ int main(int argc, char *argv[])
udev_set_log_fn(udev, log_fn); udev_set_log_fn(udev, log_fn);
udev_selinux_init(udev); 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) { while (1) {
int option; int option;