*
*/
+#undef DEBUG
+
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
int retval = 0;
int found;
- dbg("class_dev->sysdevice->directory->path = '%s'", class_dev->sysdevice->directory->path);
- dbg("class_dev->sysdevice->bus_id = '%s'", class_dev->sysdevice->bus_id);
+ attr->mode = -1;
+ if (class_dev->sysdevice) {
+ dbg("class_dev->sysdevice->directory->path = '%s'", class_dev->sysdevice->directory->path);
+ dbg("class_dev->sysdevice->bus_id = '%s'", class_dev->sysdevice->bus_id);
+ } else {
+ dbg("class_dev->name = '%s'", class_dev->name);
+ }
list_for_each(tmp, &config_device_list) {
struct config_device *dev = list_entry(tmp, struct config_device, node);
switch (dev->type) {
case LABEL:
- dbg("LABEL name = '%s', bus = '%s', sysfs_file = '%s', sysfs_value = '%s'"
- " owner = '%s', group = '%s', mode = '%#o'",
- dev->attr.name, dev->bus, dev->sysfs_file, dev->sysfs_value,
+ {
+ char *temp;
+
+ dbg("LABEL: match file '%s' with value '%s'", dev->sysfs_file, dev->sysfs_value);
+ /* try to find the attribute in the class device directory */
+ temp = sysfs_get_value_from_attributes(class_dev->directory->attributes, dev->sysfs_file);
+ if (temp)
+ goto label_found;
+
+ /* look in the class device device directory if present */
+ if (class_dev->sysdevice) {
+ temp = sysfs_get_value_from_attributes(class_dev->sysdevice->directory->attributes, dev->sysfs_file);
+ if (temp)
+ goto label_found;
+ }
+
+ /* bah, let's go backwards up a level to see if the device is there,
+ * as block partitions don't point to the physical device. Need to fix that
+ * up in the kernel...
+ */
+ if (strstr(class_dev->directory->path, "block")) {
+ dbg("looking at block device...");
+ if (isdigit(class_dev->directory->path[strlen(class_dev->directory->path)-1])) {
+ char path[SYSFS_PATH_MAX];
+ struct sysfs_class_device *class_dev_parent;
+
+ dbg("really is a partition...");
+ strcpy(path, class_dev->directory->path);
+ temp = strrchr(path, '/');
+ *temp = 0x00;
+ dbg("looking for a class device at '%s'", path);
+ class_dev_parent = sysfs_open_class_device(path);
+ if (class_dev_parent == NULL) {
+ dbg ("sysfs_open_class_device failed");
+ continue;
+ }
+ dbg("class_dev_parent->name = %s", class_dev_parent->name);
+
+ /* try to find the attribute in the class device directory */
+ temp = sysfs_get_value_from_attributes(class_dev_parent->directory->attributes, dev->sysfs_file);
+ if (temp) {
+ //sysfs_close_class_device(class_dev_parent);
+ goto label_found;
+ }
+
+ /* look in the class device device directory if present */
+ if (class_dev_parent->sysdevice) {
+ temp = sysfs_get_value_from_attributes(class_dev_parent->sysdevice->directory->attributes, dev->sysfs_file);
+ if (temp) {
+ // sysfs_close_class_device(class_dev_parent);
+ goto label_found;
+ }
+ }
+
+ }
+ }
+ continue;
+
+label_found:
+ temp[strlen(temp)-1] = 0x00;
+ dbg("file '%s' found with value '%s' compare with '%s'", dev->sysfs_file, temp, dev->sysfs_value);
+ if (strcmp(dev->sysfs_value, temp) != 0)
+ continue;
+
+ strcpy(attr->name, dev->attr.name);
+ if (isdigit(class_dev->directory->path[strlen(class_dev->directory->path)-1])) {
+ temp[0] = class_dev->directory->path[strlen(class_dev->directory->path)-1];
+ temp[1] = 0x00;
+ strcat(attr->name, temp);
+ }
+ if (dev->attr.mode != 0) {
+ attr->mode = dev->attr.mode;
+ strcpy(attr->owner, dev->attr.owner);
+ strcpy(attr->group, dev->attr.group);
+ }
+ dbg("file '%s' with value '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+ dev->sysfs_file, dev->sysfs_value, attr->name,
dev->attr.owner, dev->attr.group, dev->attr.mode);
+ goto done;
break;
+ }
case NUMBER:
- dbg("NUMBER name = '%s', bus = '%s', id = '%s'"
- " owner = '%s', group = '%s', mode = '%#o'",
- dev->attr.name, dev->bus, dev->id,
+ {
+ char path[SYSFS_PATH_MAX];
+ char *temp;
+
+ found = 0;
+ if (!class_dev->sysdevice)
+ continue;
+ strcpy(path, class_dev->sysdevice->directory->path);
+ temp = strrchr(path, '/');
+ dbg("NUMBER path = '%s'", path);
+ dbg("NUMBER temp = '%s' id = '%s'", temp, dev->id);
+ if (strstr(temp, dev->id) != NULL) {
+ found = 1;
+ } else {
+ *temp = 0x00;
+ temp = strrchr(path, '/');
+ dbg("NUMBERY temp = '%s' id = '%s'", temp, dev->id);
+ if (strstr(temp, dev->id) != NULL)
+ found = 1;
+ }
+ if (!found)
+ continue;
+
+ strcpy(attr->name, dev->attr.name);
+ if (dev->attr.mode != 0) {
+ attr->mode = dev->attr.mode;
+ strcpy(attr->owner, dev->attr.owner);
+ strcpy(attr->group, dev->attr.group);
+ }
+ dbg("device id '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+ dev->id, attr->name,
dev->attr.owner, dev->attr.group, dev->attr.mode);
+ goto done;
break;
+ }
case TOPOLOGY:
{
char path[SYSFS_PATH_MAX];
char *temp;
+ if (!class_dev->sysdevice)
+ continue;
found = 0;
strcpy(path, class_dev->sysdevice->directory->path);
temp = strrchr(path, '/');
continue;
strcpy(attr->name, dev->attr.name);
- attr->mode = dev->attr.mode;
- strcpy(attr->owner, dev->attr.owner);
- strcpy(attr->group, dev->attr.group);
+ if (dev->attr.mode != 0) {
+ attr->mode = dev->attr.mode;
+ strcpy(attr->owner, dev->attr.owner);
+ strcpy(attr->group, dev->attr.group);
+ }
dbg("device at '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
dev->place, attr->name,
dev->attr.owner, dev->attr.group, dev->attr.mode);
- return retval;
+ goto done;
break;
}
case REPLACE:
if (strcmp(dev->kernel_name, class_dev->name) != 0)
continue;
strcpy(attr->name, dev->attr.name);
- attr->mode = dev->attr.mode;
- strcpy(attr->owner, dev->attr.owner);
- strcpy(attr->group, dev->attr.group);
+ if (dev->attr.mode != 0) {
+ attr->mode = dev->attr.mode;
+ strcpy(attr->owner, dev->attr.owner);
+ strcpy(attr->group, dev->attr.group);
+ }
dbg("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
dev->kernel_name, attr->name,
dev->attr.owner, dev->attr.group, dev->attr.mode);
- return retval;
+ goto done;
+ break;
+ case KERNEL_NAME:
break;
default:
- dbg("Unknown type of device!");
+ dbg("Unknown type of device '%d'", dev->type);
break;
}
}
- attr->mode = get_default_mode(class_dev);
- attr->owner[0] = 0x00;
- attr->group[0] = 0x00;
strcpy(attr->name, class_dev->name);
+
+done:
+ if (attr->mode == -1) {
+ attr->mode = get_default_mode(class_dev);
+ attr->owner[0] = 0x00;
+ attr->group[0] = 0x00;
+ }
return retval;
}
~ianmdlvl / elogind.git / blobdiff