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

[PATCH] udev - fix debug info for multiple rule file config

Browse Source 
On Sat, Feb 28, 2004 at 09:56:32PM +0100, Kay Sievers wrote:
> Andrey pointed out that we don't print the right filename in the debug
> output. Here is a fix for that. It applies on top of Andrey's symlink
> patch, cause we are touching the same part of the code.

The copy/paste devil catched me :)
Here is a fixed one.
This commit is contained in:
kay.sievers@vrfy.org 2004-03-01 22:28:51 -08:00 committed by Greg KH
parent 63ead27c22
commit bd5f8e7cd1
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
namedev.c
View File

@ -822,7 +822,7 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
if (match_rule(dev, class_dev, udev, sysfs_device) == 0) { if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
if (dev->name[0] == '\0' && dev->symlink[0] == '\0') { if (dev->name[0] == '\0' && dev->symlink[0] == '\0') {
info("configured rule in '%s' at line %i applied, '%s' is ignored", info("configured rule in '%s' at line %i applied, '%s' is ignored",
udev_rules_filename, dev->config_line, udev->kernel_name); dev->config_file, dev->config_line, udev->kernel_name);
return -1; return -1;
} }
@ -830,7 +830,7 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
char temp[NAME_MAX]; char temp[NAME_MAX];
info("configured rule in '%s' at line %i applied, added symlink '%s'", info("configured rule in '%s' at line %i applied, added symlink '%s'",
udev_rules_filename, dev->config_line, dev->symlink); dev->config_file, dev->config_line, dev->symlink);
/* do not clobber dev */ /* do not clobber dev */
strfieldcpy(temp, dev->symlink); strfieldcpy(temp, dev->symlink);
apply_format(udev, temp, sizeof(temp), apply_format(udev, temp, sizeof(temp),
@ -841,7 +841,7 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
if (dev->name[0] != '\0') { if (dev->name[0] != '\0') {
info("configured rule in '%s' at line %i applied, '%s' becomes '%s'", info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
udev_rules_filename, dev->config_line, udev->kernel_name, dev->name); dev->config_file, dev->config_line, udev->kernel_name, dev->name);
strfieldcpy(udev->name, dev->name); strfieldcpy(udev->name, dev->name);
goto found; goto found;
} }

1
namedev.h
View File

@ -72,6 +72,7 @@ struct config_device {
char symlink[NAME_SIZE]; char symlink[NAME_SIZE];
struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS]; struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
int partitions; int partitions;
char config_file[NAME_SIZE];
int config_line; int config_line;
}; };

1
namedev_parse.c
View File

@ -260,6 +260,7 @@ static int namedev_parse_rules(char *filename)
} }
dev.config_line = lineno; dev.config_line = lineno;
strfieldcpy(dev.config_file, filename);
retval = add_config_dev(&dev); retval = add_config_dev(&dev);
if (retval) { if (retval) {
dbg("add_config_dev returned with error %d", retval); dbg("add_config_dev returned with error %d", retval);