chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] first cut at standalone udev_selinux program.
[elogind.git]
/
namedev.c
diff --git
a/namedev.c
b/namedev.c
index e075e20af57dd189efaae8f6a823f8b1104fc012..b9d8a3db2c2dec9fc9e8c7b2157b77e0e16b6173 100644
(file)
--- a/
namedev.c
+++ b/
namedev.c
@@
-816,11
+816,15
@@
int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
}
if (dev->symlink[0] != '\0') {
}
if (dev->symlink[0] != '\0') {
+ char temp[NAME_SIZE];
+
info("configured rule in '%s' at line %i applied, added symlink '%s'",
dev->config_file, dev->config_line, dev->symlink);
info("configured rule in '%s' at line %i applied, added symlink '%s'",
dev->config_file, dev->config_line, dev->symlink);
+ strfieldcpy(temp, dev->symlink);
+ apply_format(udev, temp, sizeof(temp), class_dev, sysfs_device);
if (udev->symlink[0] != '\0')
strfieldcat(udev->symlink, " ");
if (udev->symlink[0] != '\0')
strfieldcat(udev->symlink, " ");
- strfieldcat(udev->symlink,
dev->symlink
);
+ strfieldcat(udev->symlink,
temp
);
}
if (dev->name[0] != '\0') {
}
if (dev->name[0] != '\0') {
@@
-838,17
+842,16
@@
int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
found:
apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
found:
apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
- apply_format(udev, udev->symlink, sizeof(udev->symlink), class_dev, sysfs_device);
udev->partitions = dev->partitions;
strfieldcpy(udev->config_file, dev->config_file);
udev->config_line = dev->config_line;
udev->partitions = dev->partitions;
strfieldcpy(udev->config_file, dev->config_file);
udev->config_line = dev->config_line;
-done:
/* get permissions given in rule */
set_empty_perms(udev, dev->mode,
dev->owner,
dev->group);
/* get permissions given in rule */
set_empty_perms(udev, dev->mode,
dev->owner,
dev->group);
+done:
/* get permissions given in config file or set defaults */
perm = find_perm(udev->name);
if (perm != NULL) {
/* get permissions given in config file or set defaults */
perm = find_perm(udev->name);
if (perm != NULL) {