#include <ctype.h>
#include <unistd.h>
#include <errno.h>
+#include <time.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include "list.h"
#include "udev.h"
#include "udev_version.h"
+#include "logging.h"
#include "namedev.h"
#include "libsysfs/libsysfs.h"
#include "klibc_fixups.h"
int add_perm_dev(struct perm_device *new_dev)
{
- struct list_head *tmp;
+ struct perm_device *dev;
struct perm_device *tmp_dev;
/* update the values if we already have the device */
- list_for_each(tmp, &perm_device_list) {
- struct perm_device *dev = list_entry(tmp, struct perm_device, node);
+ list_for_each_entry(dev, &perm_device_list, node) {
if (strcmp_pattern(new_dev->name, dev->name))
continue;
copy_var(dev, new_dev, mode);
static struct perm_device *find_perm(char *name)
{
- struct list_head *tmp;
- struct perm_device *perm = NULL;
+ struct perm_device *perm;
- list_for_each(tmp, &perm_device_list) {
- perm = list_entry(tmp, struct perm_device, node);
+ list_for_each_entry(perm, &perm_device_list, node) {
if (strcmp_pattern(perm->name, name))
continue;
return perm;
return NULL;
}
-static mode_t get_default_mode(struct sysfs_class_device *class_dev)
+static mode_t get_default_mode(void)
{
mode_t mode = 0600; /* default to owner rw only */
- if (strlen(default_mode_str) != 0) {
+ if (strlen(default_mode_str) != 0)
mode = strtol(default_mode_str, NULL, 8);
- }
+
return mode;
}
+static char *get_default_owner(void)
+{
+ if (strlen(default_owner_str) == 0)
+ strncpy(default_owner_str, "root", OWNER_SIZE);
+
+ return default_owner_str;
+}
+
+static char *get_default_group(void)
+{
+ if (strlen(default_group_str) == 0)
+ strncpy(default_group_str, "root", GROUP_SIZE);
+
+ return default_group_str;
+}
+
static void apply_format(struct udevice *udev, unsigned char *string)
{
- char name[NAME_SIZE];
char temp[NAME_SIZE];
+ char temp1[NAME_SIZE];
char *tail;
char *pos;
char *pos2;
char *pos3;
int num;
+ pos = string;
while (1) {
num = 0;
- pos = strchr(string, '%');
+ pos = strchr(pos, '%');
if (pos) {
- *pos = '\0';
+ pos[0] = '\0';
tail = pos+1;
if (isdigit(tail[0])) {
num = (int) strtoul(&pos[1], &tail, 10);
break;
}
}
- strfieldcpy(name, tail+1);
+ strfieldcpy(temp, tail+1);
switch (tail[0]) {
case 'b':
strcat(pos, udev->kernel_number);
dbg("substitute kernel number '%s'", udev->kernel_number);
break;
- case 'D':
- if (strlen(udev->kernel_number) == 0) {
- strcat(pos, "disc");
- dbg("substitute devfs disc");
- break;
- }
- strcat(pos, "part");
- strcat(pos, udev->kernel_number);
- dbg("substitute devfs part '%s'", udev->kernel_number);
- break;
case 'm':
sprintf(pos, "%u", udev->minor);
dbg("substitute minor number '%u'", udev->minor);
dbg("substitute major number '%u'", udev->major);
break;
case 'c':
- if (strlen(udev->callout_value) == 0)
+ if (strlen(udev->program_result) == 0)
break;
if (num) {
/* get part of return string */
- strncpy(temp, udev->callout_value, sizeof(temp));
- pos2 = temp;
+ strncpy(temp1, udev->program_result, sizeof(temp1));
+ pos2 = temp1;
while (num) {
num--;
pos3 = strsep(&pos2, " ");
if (pos3 == NULL) {
- dbg("requested part of callout string not found");
+ dbg("requested part of result string not found");
break;
}
}
if (pos3) {
strcat(pos, pos3);
- dbg("substitute partial callout output '%s'", pos3);
+ dbg("substitute part of result string '%s'", pos3);
}
} else {
- strcat(pos, udev->callout_value);
- dbg("substitute callout output '%s'", udev->callout_value);
+ strcat(pos, udev->program_result);
+ dbg("substitute result string '%s'", udev->program_result);
}
break;
+ case '%':
+ strcat(pos, "%");
+ pos++;
+ break;
default:
dbg("unknown substitution type '%%%c'", pos[1]);
break;
}
- strcat(string, name);
+ strcat(string, temp);
} else
break;
}
} bus_files[] = {
{ .bus = "scsi", .file = "vendor" },
{ .bus = "usb", .file = "idVendor" },
+ { .bus = "usb-serial", .file = "detach_state" },
{ .bus = "ide", .file = "detach_state" },
{ .bus = "pci", .file = "vendor" },
{}
/* sleep to give the kernel a chance to create the file */
sleep(1);
}
- dbg("Timed out waiting for '%s' file, continuing on anyway...", b->file);
+ dbg("timed out waiting for '%s' file, continuing on anyway...", b->file);
goto exit;
}
b++;
}
- dbg("Did not find bus type '%s' on list of bus_id_files, contact greg@kroah.com", sysfs_device->bus);
+ dbg("did not find bus type '%s' on list of bus_id_files, contact greg@kroah.com", sysfs_device->bus);
exit:
return; /* here to prevent compiler warning... */
}
-static int exec_callout(struct config_device *dev, char *value, int len)
+static int execute_program(char *path, char *value, int len)
{
int retval;
int res;
int value_set = 0;
char buffer[256];
char *pos;
- char *args[CALLOUT_MAXARG];
+ char *args[PROGRAM_MAXARG];
int i;
- dbg("callout to '%s'", dev->exec_program);
+ dbg("executing '%s'", path);
retval = pipe(fds);
if (retval != 0) {
dbg("pipe failed");
return -1;
}
pid = fork();
- if (pid == -1) {
- dbg("fork failed");
- return -1;
- }
-
- if (pid == 0) {
+ switch(pid) {
+ case 0:
/* child */
close(STDOUT_FILENO);
dup(fds[1]); /* dup write side of pipe to STDOUT */
- if (strchr(dev->exec_program, ' ')) {
- /* callout with arguments */
- pos = dev->exec_program;
- for (i=0; i < CALLOUT_MAXARG-1; i++) {
+ if (strchr(path, ' ')) {
+ /* exec with arguments */
+ pos = path;
+ for (i=0; i < PROGRAM_MAXARG-1; i++) {
args[i] = strsep(&pos, " ");
if (args[i] == NULL)
break;
dbg("too many args - %d", i);
args[i] = NULL;
}
- retval = execve(args[0], args, main_envp);
+ retval = execv(args[0], args);
} else {
- retval = execve(dev->exec_program, main_argv, main_envp);
- }
- if (retval != 0) {
- dbg("child execve failed");
- exit(1);
+ retval = execv(path, main_argv);
}
- return -1; /* avoid compiler warning */
- } else {
+ dbg("child execve failed");
+ exit(1);
+ case -1:
+ dbg("fork failed");
+ return -1;
+ default:
/* parent reads from fds[0] */
close(fds[1]);
retval = 0;
break;
buffer[res] = '\0';
if (res > len) {
- dbg("callout len %d too short", len);
+ dbg("result len %d too short", len);
retval = -1;
}
if (value_set) {
- dbg("callout value already set");
+ dbg("result value already set");
retval = -1;
} else {
value_set = 1;
pos = value + strlen(value)-1;
if (pos[0] == '\n')
pos[0] = '\0';
- dbg("callout returned '%s'", value);
+ dbg("result is '%s'", value);
}
}
close(fds[0]);
retval = -1;
}
-#ifndef __KLIBC__
if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
- dbg("callout program status 0x%x", status);
+ dbg("exec program status 0x%x", status);
retval = -1;
}
-#endif
}
return retval;
}
-static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
-{
- struct config_device *dev;
- struct list_head *tmp;
-
- list_for_each(tmp, &config_device_list) {
- dev = list_entry(tmp, struct config_device, node);
- if (dev->type != CALLOUT)
- continue;
-
- if (dev->bus[0] != '\0') {
- /* as the user specified a bus, we must match it up */
- if (!sysfs_device)
- continue;
- dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
- if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
- continue;
- }
-
- /* substitute anything that needs to be in the program name */
- apply_format(udev, dev->exec_program);
- if (exec_callout(dev, udev->callout_value, NAME_SIZE))
- continue;
- if (strcmp_pattern(dev->id, udev->callout_value) != 0)
- continue;
- strfieldcpy(udev->name, dev->name);
- strfieldcpy(udev->symlink, dev->symlink);
- dbg("callout returned matching value '%s', '%s' becomes '%s'",
- dev->id, class_dev->name, udev->name);
- return 0;
- }
- return -ENODEV;
-}
-
-static int match_pair(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, struct sysfs_pair *pair)
+static int compare_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, struct sysfs_pair *pair)
{
struct sysfs_attribute *tmpattr = NULL;
char *c;
if (tmpattr)
goto label_found;
}
-
return -ENODEV;
label_found:
return 0;
}
-static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+static int match_sysfs_pairs(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
{
struct sysfs_pair *pair;
- struct config_device *dev;
- struct list_head *tmp;
int i;
- int match;
- list_for_each(tmp, &config_device_list) {
- dev = list_entry(tmp, struct config_device, node);
- if (dev->type != LABEL)
- continue;
-
- if (dev->bus[0] != '\0') {
- /* as the user specified a bus, we must match it up */
- if (!sysfs_device)
- continue;
- dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
- if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
- continue;
- }
-
- match = 1;
- for (i = 0; i < MAX_SYSFS_PAIRS; ++i) {
- pair = &dev->sysfs_pair[i];
- if ((pair->file[0] == '\0') || (pair->value[0] == '\0'))
- break;
- if (match_pair(class_dev, sysfs_device, pair) != 0) {
- match = 0;
- break;
- }
+ for (i = 0; i < MAX_SYSFS_PAIRS; ++i) {
+ pair = &dev->sysfs_pair[i];
+ if ((pair->file[0] == '\0') || (pair->value[0] == '\0'))
+ break;
+ if (compare_sysfs_attribute(class_dev, sysfs_device, pair) != 0) {
+ dbg("sysfs attribute doesn't match");
+ return -ENODEV;
}
- if (match == 0)
- continue;
-
- /* found match */
- strfieldcpy(udev->name, dev->name);
- strfieldcpy(udev->symlink, dev->symlink);
- dbg("found matching attribute, '%s' becomes '%s' ",
- class_dev->name, udev->name);
-
- return 0;
}
- return -ENODEV;
+
+ return 0;
}
-static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+static int match_id(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
{
- struct config_device *dev;
- struct list_head *tmp;
char path[SYSFS_PATH_MAX];
int found;
char *temp = NULL;
- /* we have to have a sysfs device for NUMBER to work */
+ /* we have to have a sysfs device for ID to work */
if (!sysfs_device)
return -ENODEV;
- list_for_each(tmp, &config_device_list) {
- dev = list_entry(tmp, struct config_device, node);
- if (dev->type != NUMBER)
- continue;
-
- dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
- if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
- continue;
-
- found = 0;
- strfieldcpy(path, sysfs_device->path);
+ found = 0;
+ strfieldcpy(path, sysfs_device->path);
+ temp = strrchr(path, '/');
+ dbg("search '%s' in '%s', path='%s'", dev->id, temp, path);
+ if (strstr(temp, dev->id) != NULL) {
+ found = 1;
+ } else {
+ *temp = 0x00;
temp = strrchr(path, '/');
dbg("search '%s' in '%s', path='%s'", dev->id, temp, path);
- if (strstr(temp, dev->id) != NULL) {
+ if (strstr(temp, dev->id) != NULL)
found = 1;
- } else {
- *temp = 0x00;
- temp = strrchr(path, '/');
- dbg("search '%s' in '%s', path='%s'", dev->id, temp, path);
- if (strstr(temp, dev->id) != NULL)
- found = 1;
- }
- if (!found)
- continue;
- strfieldcpy(udev->name, dev->name);
- strfieldcpy(udev->symlink, dev->symlink);
- dbg("found matching id '%s', '%s' becomes '%s'",
- dev->id, class_dev->name, udev->name);
- return 0;
}
- return -ENODEV;
+ if (!found) {
+ dbg("id doesn't match");
+ return -ENODEV;
+ }
+
+ return 0;
}
-static int do_topology(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+static int match_place(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
{
- struct config_device *dev;
- struct list_head *tmp;
char path[SYSFS_PATH_MAX];
int found;
char *temp = NULL;
- /* we have to have a sysfs device for TOPOLOGY to work */
+ /* we have to have a sysfs device for PLACE to work */
if (!sysfs_device)
return -ENODEV;
- list_for_each(tmp, &config_device_list) {
- dev = list_entry(tmp, struct config_device, node);
- if (dev->type != TOPOLOGY)
- continue;
-
- dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
- if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
- continue;
-
- found = 0;
- strfieldcpy(path, sysfs_device->path);
+ found = 0;
+ strfieldcpy(path, sysfs_device->path);
+ temp = strrchr(path, '/');
+ dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
+ if (strstr(temp, dev->place) != NULL) {
+ found = 1;
+ } else {
+ *temp = 0x00;
temp = strrchr(path, '/');
dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
- if (strstr(temp, dev->place) != NULL) {
+ if (strstr(temp, dev->place) != NULL)
found = 1;
- } else {
- *temp = 0x00;
- temp = strrchr(path, '/');
- dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
- if (strstr(temp, dev->place) != NULL)
- found = 1;
- }
- if (!found)
- continue;
-
- strfieldcpy(udev->name, dev->name);
- strfieldcpy(udev->symlink, dev->symlink);
- dbg("found matching place '%s', '%s' becomes '%s'",
- dev->place, class_dev->name, udev->name);
- return 0;
}
- return -ENODEV;
-}
-
-static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
-{
- struct config_device *dev;
- struct list_head *tmp;
-
- list_for_each(tmp, &config_device_list) {
- dev = list_entry(tmp, struct config_device, node);
- if (dev->type != REPLACE)
- continue;
-
- dbg("compare name '%s' with '%s'", dev->kernel_name, class_dev->name);
- if (strcmp_pattern(dev->kernel_name, class_dev->name) != 0)
- continue;
-
- strfieldcpy(udev->name, dev->name);
- strfieldcpy(udev->symlink, dev->symlink);
- dbg("found name, '%s' becomes '%s'", dev->kernel_name, udev->name);
-
- return 0;
+ if (!found) {
+ dbg("place doesn't match");
+ return -ENODEV;
}
- return -ENODEV;
-}
-static void do_kernelname(struct sysfs_class_device *class_dev, struct udevice *udev)
-{
- /* heh, this is pretty simple... */
- strfieldcpy(udev->name, class_dev->name);
+ return 0;
}
static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_dev)
{
struct sysfs_device *sysfs_device;
struct sysfs_class_device *class_dev_parent;
+ struct timespec tspec;
int loop;
- char filename[SYSFS_PATH_MAX + 6];
- int retval;
- char *temp;
- int partition = 0;
/* Figure out where the device symlink is at. For char devices this will
* always be in the class_dev->path. But for block devices, it's different.
* symlink yet. We do sit and spin on waiting for them right now, we should
* possibly have a whitelist for these devices here...
*/
- strcpy(filename, class_dev->path);
- dbg("filename = %s", filename);
- if (strcmp(class_dev->classname, SYSFS_BLOCK_NAME) == 0) {
- if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
- temp = strrchr(filename, '/');
- if (temp) {
- char *temp2 = strrchr(filename, '/');
- partition = 1;
- *temp = 0x00;
- dbg("temp2 = %s", temp2);
- if (temp2 && (strcmp(temp2, "/block") == 0)) {
- /* oops, we have no parent block device, so go back to original directory */
- strcpy(filename, class_dev->path);
- partition = 0;
- }
- }
- }
- }
- strcat(filename, "/device");
+ class_dev_parent = sysfs_get_classdev_parent(class_dev);
+ if (class_dev_parent)
+ dbg("Really a partition");
- loop = 2;
+ tspec.tv_sec = 0;
+ tspec.tv_nsec = 10000000; /* sleep 10 millisec */
+ loop = 10;
while (loop--) {
- struct stat buf;
- dbg("looking for '%s'", filename);
- retval = stat(filename, &buf);
- if (!retval)
- break;
- /* sleep to give the kernel a chance to create the device file */
- sleep(1);
- }
+ nanosleep(&tspec, NULL);
+ if (class_dev_parent)
+ sysfs_device = sysfs_get_classdev_device(class_dev_parent);
+ else
+ sysfs_device = sysfs_get_classdev_device(class_dev);
- loop = 1; /* FIXME put a real value in here for when everything is fixed... */
- while (loop--) {
- /* find the sysfs_device for this class device */
- /* Wouldn't it really be nice if libsysfs could do this for us? */
- sysfs_device = sysfs_get_classdev_device(class_dev);
if (sysfs_device != NULL)
- goto exit;
+ goto device_found;
+ }
+ dbg("timed out waiting for device symlink, continuing on anyway...");
+
+device_found:
+ /* We have another issue with just the wait above - the sysfs part of
+ * the kernel may not be quick enough to have created the link to the
+ * device under the "bus" subsystem. Due to this, the sysfs_device->bus
+ * will not contain the actual bus name :(
+ *
+ * Libsysfs now provides a new API sysfs_get_device_bus(), so use it
+ * if needed
+ */
+ if (sysfs_device) {
+ if (sysfs_device->bus[0] != '\0')
+ goto bus_found;
+
+ loop = 10;
+ tspec.tv_nsec = 10000000;
+ while (loop--) {
+ nanosleep(&tspec, NULL);
+ sysfs_get_device_bus(sysfs_device);
+
+ if (sysfs_device->bus[0] != '\0')
+ goto bus_found;
+ }
+ dbg("timed out waiting to find the device bus, continuing on anyway");
+ goto exit;
+bus_found:
+ dbg("device %s is registered with bus '%s'",
+ sysfs_device->name, sysfs_device->bus);
+ }
+exit:
+ return sysfs_device;
+}
- /* if it's a partition, we need to get the parent device */
- if (partition) {
- /* FIXME HACK HACK HACK HACK
- * for some reason partitions need this extra sleep here, in order
- * to wait for the device properly. Once the libsysfs code is
- * fixed properly, this sleep should go away, and we can just loop above.
- */
- sleep(1);
- dbg("really is a partition");
- class_dev_parent = sysfs_get_classdev_parent(class_dev);
- if (class_dev_parent == NULL) {
- dbg("sysfs_get_classdev_parent for class device '%s' failed", class_dev->name);
+static int match_rule(struct config_device *dev, struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+{
+ while (1) {
+ /* check for matching bus value */
+ if (dev->bus[0] != '\0') {
+ if (sysfs_device == NULL) {
+ dbg("device has no bus");
+ goto no_good;
+ }
+ dbg("check for " FIELD_BUS " dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+ if (strcmp_pattern(dev->bus, sysfs_device->bus) != 0) {
+ dbg(FIELD_BUS " is not matching");
+ goto no_good;
} else {
- dbg("class_dev_parent->name='%s'", class_dev_parent->name);
- sysfs_device = sysfs_get_classdev_device(class_dev_parent);
- if (sysfs_device != NULL)
- goto exit;
+ dbg(FIELD_BUS " matches");
}
}
- /* sleep to give the kernel a chance to create the link */
- /* FIXME remove comment...
- sleep(1); */
+
+ /* check for matching kernel name*/
+ if (dev->kernel[0] != '\0') {
+ dbg("check for " FIELD_KERNEL " dev->kernel='%s' class_dev->name='%s'", dev->kernel, class_dev->name);
+ if (strcmp_pattern(dev->kernel, class_dev->name) != 0) {
+ dbg(FIELD_KERNEL " is not matching");
+ goto no_good;
+ } else {
+ dbg(FIELD_KERNEL " matches");
+ }
+ }
+
+ /* check for matching bus id */
+ if (dev->id[0] != '\0') {
+ dbg("check " FIELD_ID);
+ if (match_id(dev, class_dev, sysfs_device) != 0) {
+ dbg(FIELD_ID " is not matching");
+ goto no_good;
+ } else {
+ dbg(FIELD_ID " matches");
+ }
+ }
+
+ /* check for matching place of device */
+ if (dev->place[0] != '\0') {
+ dbg("check " FIELD_PLACE);
+ if (match_place(dev, class_dev, sysfs_device) != 0) {
+ dbg(FIELD_PLACE " is not matching");
+ goto no_good;
+ } else {
+ dbg(FIELD_PLACE " matches");
+ }
+ }
+
+ /* check for matching sysfs pairs */
+ if (dev->sysfs_pair[0].file[0] != '\0') {
+ dbg("check " FIELD_SYSFS " pairs");
+ if (match_sysfs_pairs(dev, class_dev, sysfs_device) != 0) {
+ dbg(FIELD_SYSFS " is not matching");
+ goto no_good;
+ } else {
+ dbg(FIELD_SYSFS " matches");
+ }
+ }
+
+ /* execute external program */
+ if (dev->program[0] != '\0') {
+ dbg("check " FIELD_PROGRAM);
+ apply_format(udev, dev->program);
+ if (execute_program(dev->program, udev->program_result, NAME_SIZE) != 0) {
+ dbg(FIELD_PROGRAM " returned nozero");
+ goto no_good;
+ } else {
+ dbg(FIELD_PROGRAM " returned successful");
+ }
+ }
+
+ /* check for matching result of external program */
+ if (dev->result[0] != '\0') {
+ dbg("check for " FIELD_RESULT
+ " dev->result='%s', udev->program_result='%s'",
+ dev->result, udev->program_result);
+ if (strcmp_pattern(dev->result, udev->program_result) != 0) {
+ dbg(FIELD_RESULT " is not matching");
+ goto no_good;
+ } else {
+ dbg(FIELD_RESULT " matches");
+ }
+ }
+
+ /* check if we are instructed to ignore this device */
+ if (dev->name[0] == '\0') {
+ dbg("instructed to ignore this device");
+ return -1;
+ }
+
+ /* Yeah, we matched! */
+ return 0;
+
+no_good:
+ sysfs_device = sysfs_get_device_parent(sysfs_device);
+ if (sysfs_device == NULL)
+ return -ENODEV;
+ dbg("sysfs_device->path='%s'", sysfs_device->path);
+ dbg("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
+ dbg("sysfs_device->bus='%s'", sysfs_device->bus);
}
- dbg("Timed out waiting for device symlink, continuing on anyway...");
-exit:
- return sysfs_device;
+
}
int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *udev)
{
struct sysfs_device *sysfs_device = NULL;
- int retval = 0;
+ struct config_device *dev;
struct perm_device *perm;
char *pos;
strfieldcpy(udev->kernel_number, pos);
dbg("kernel_number='%s'", udev->kernel_number);
- /* rules are looked at in priority order */
- retval = do_callout(class_dev, udev, sysfs_device);
- if (retval == 0)
- goto found;
-
- retval = do_label(class_dev, udev, sysfs_device);
- if (retval == 0)
- goto found;
-
- retval = do_number(class_dev, udev, sysfs_device);
- if (retval == 0)
- goto found;
-
- retval = do_topology(class_dev, udev, sysfs_device);
- if (retval == 0)
- goto found;
-
- retval = do_replace(class_dev, udev, sysfs_device);
- if (retval == 0)
- goto found;
+ /* look for a matching rule to apply */
+ list_for_each_entry(dev, &config_device_list, node) {
+ dbg("process rule");
+
+ if (match_rule(dev, class_dev, udev, sysfs_device) == 0) {
+ /* Yup, this rule belongs to us! */
+ info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
+ udev_rules_filename, dev->config_line, udev->kernel_name, dev->name);
+ strfieldcpy(udev->name, dev->name);
+ strfieldcpy(udev->symlink, dev->symlink);
+ goto found;
+ }
+ }
- do_kernelname(class_dev, udev);
+ /* no rule was found so we use the kernel name */
+ strfieldcpy(udev->name, class_dev->name);
goto done;
found:
strfieldcpy(udev->group, perm->group);
} else {
/* no matching perms found :( */
- udev->mode = get_default_mode(class_dev);
- udev->owner[0] = 0x00;
- udev->group[0] = 0x00;
+ udev->mode = get_default_mode();
+ strncpy(udev->owner, get_default_owner(), OWNER_SIZE);
+ strncpy(udev->group, get_default_group(), GROUP_SIZE);
}
dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
udev->name, udev->owner, udev->group, udev->mode);
~ianmdlvl / elogind.git / blobdiff