X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.c;h=26c68fadf6ed9487ff576fb2bf962634cba398a5;hp=3843d028693c305b4bf0e15ae93f14e4b3589815;hb=d25e14ae1ef476fdc1d2b690b9426bd45bafd34e;hpb=f608f8ac16889ce0e7e800c7f11dacc558d097c1

diff --git a/namedev.c b/namedev.c
index 3843d0286..26c68fadf 100644
--- a/namedev.c
+++ b/namedev.c
@@ -29,27 +29,20 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <errno.h>
-#include <time.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <sys/sysinfo.h>
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "list.h"
 #include "udev.h"
-#include "udev_lib.h"
+#include "udev_utils.h"
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
-#include "klibc_fixups.h"
-#include "udevdb.h"
+#include "udev_db.h"
 
 static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr);
 
-LIST_HEAD(config_device_list);
-LIST_HEAD(perm_device_list);
-
-
 /* compare string with pattern (supports * ? [0-9] [!A-Z]) */
 static int strcmp_pattern(const char *p, const char *s)
 {
@@ -103,44 +96,6 @@ static int strcmp_pattern(const char *p, const char *s)
 	return 1;
 }
 
-static struct perm_device *find_perm(char *name)
-{
-	struct perm_device *perm;
-
-	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(void)
-{
-	mode_t mode = 0600;	/* default to owner rw only */
-
-	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)
-		strfieldcpy(default_owner_str, "root");
-
-	return default_owner_str;
-}
-
-static char *get_default_group(void)
-{
-	if (strlen(default_group_str) == 0)
-		strfieldcpy(default_group_str, "root");
-
-	return default_group_str;
-}
-
 /* extract possible {attr} and move str behind it */
 static char *get_format_attribute(char **str)
 {
@@ -186,29 +141,29 @@ static int get_format_len(char **str)
  *  @param  name                Name to check for
  *  @return                     0 if <name> didn't exist and N otherwise.
  */
-static unsigned int find_free_number (struct udevice *udev, char *name)
+static int find_free_number(struct udevice *udev, const char *name)
 {
-	char temp[NAME_SIZE];
-	char path[NAME_SIZE];
-	struct udevice dev;
-	int result;
+	char filename[NAME_SIZE];
+	int num = 0;
+	struct udevice db_udev;
 
-	/* have to sweep the database for each lookup */
-	result = 0;
-	strncpy(temp, name, sizeof (temp));
+	strfieldcpy(filename, name);
 	while (1) {
-		if (udevdb_get_dev_byname(temp, path, &dev) != 0)
-			goto found;
-		/* symlink might be stale if $(udevroot) isn't cleaned; check
-		 * on major/minor to see if it's the same device
-		 */
-		if (dev.major == udev->major && dev.minor == udev->minor)
-			goto found;
-		snprintf (temp, sizeof(temp), "%s%d", name, ++result);
-	}
+		dbg("look for existing node '%s'", filename);
+		memset(&db_udev, 0x00, sizeof(struct udevice));
+		if (udev_db_get_device_byname(&db_udev, filename) != 0) {
+			dbg("free num=%d", num);
+			return num;
+		}
 
-found:
-	return result;
+		num++;
+		if (num > 1000) {
+			info("find_free_number gone crazy (num=%d), aborted", num);
+			return -1;
+		}
+		snprintf(filename, NAME_SIZE, "%s%d", name, num);
+		filename[NAME_SIZE-1] = '\0';
+	}
 }
 
 static void apply_format(struct udevice *udev, char *string, size_t maxsize,
@@ -307,6 +262,17 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 					dbg("sysfa attribute '%s' not found", attr);
 					break;
 				}
+				/* strip trailing whitespace of matching value */
+				if (isspace(tmpattr->value[strlen(tmpattr->value)-1])) {
+					i = len = strlen(tmpattr->value);
+					while (i > 0 &&  isspace(tmpattr->value[i-1]))
+						i--;
+					if (i < len) {
+						tmpattr->value[i] = '\0';
+						dbg("remove %i trailing whitespace chars from '%s'",
+							 len - i, tmpattr->value);
+					}
+				}
 				strfieldcatmax(string, tmpattr->value, maxsize);
 				dbg("substitute sysfs value '%s'", tmpattr->value);
 			} else {
@@ -320,7 +286,7 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 		case 'e':
 			next_free_number = find_free_number(udev, string);
 			if (next_free_number > 0) {
-				snprintf(temp2, sizeof(temp2), "%d", next_free_number);
+				sprintf(temp2, "%d", next_free_number);
 				strfieldcatmax(string, temp2, maxsize);
 			}
 			break;
@@ -336,69 +302,6 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
 	}
 }
 
-/* 
- * Note, we can have multiple files for different busses in here due
- * to the mess that USB has for its device tree...
- */
-static struct bus_file {
-	char *bus;
-	char *file;
-} bus_files[] = {
-	{ .bus = "scsi",	.file = "vendor" },
-	{ .bus = "usb",		.file = "idVendor" },
-	{ .bus = "usb",		.file = "iInterface" },
-	{ .bus = "usb-serial",	.file = "detach_state" },
-	{ .bus = "ide",		.file = "detach_state" },
-	{ .bus = "pci",		.file = "vendor" },
-	{}
-};
-
-#define SECONDS_TO_WAIT_FOR_FILE	10
-static void wait_for_device_to_initialize(struct sysfs_device *sysfs_device)
-{
-	/* sleep until we see the file for this specific bus type show up this
-	 * is needed because we can easily out-run the kernel in looking for
-	 * these files before the paticular subsystem has created them in the
-	 * sysfs tree properly.
-	 *
-	 * And people thought that the /sbin/hotplug event system was going to
-	 * be slow, poo on you for arguing that before even testing it...
-	 */
-	struct bus_file *b = &bus_files[0];
-	struct sysfs_attribute *tmpattr;
-	int found = 0;
-	int loop = SECONDS_TO_WAIT_FOR_FILE;
-
-	while (1) {
-		if (b->bus == NULL) {
-			if (!found)
-				break;
-			/* sleep to give the kernel a chance to create the file */
-			sleep(1);
-			--loop;
-			if (loop == 0)
-				break;
-			b = &bus_files[0];
-		}
-		if (strcmp(sysfs_device->bus, b->bus) == 0) {
-			found = 1;
-			dbg("looking for file '%s' on bus '%s'", b->file, b->bus);
-			tmpattr = sysfs_get_device_attr(sysfs_device, b->file);
-			if (tmpattr) {
-				/* found it! */
-				goto exit;
-			}
-			dbg("can't find '%s' file", b->file);
-		}
-		++b;
-	}
-	if (!found)
-		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 void fix_kernel_name(struct udevice *udev)
 {
 	char *temp = udev->kernel_name;
@@ -412,7 +315,7 @@ static void fix_kernel_name(struct udevice *udev)
 	}
 }
 
-static int execute_program(const char *path, char *value, int len)
+static int execute_program(struct udevice *udev, const char *path, char *value, int len)
 {
 	int retval;
 	int count;
@@ -445,16 +348,11 @@ static int execute_program(const char *path, char *value, int len)
 		dbg("execute '%s' with parsed arguments", arg);
 	} else {
 		argv[0] = arg;
-		argv[1] = main_argv[1];
+		argv[1] = udev->subsystem;
 		argv[2] = NULL;
 		dbg("execute '%s' with subsystem '%s' argument", arg, argv[1]);
 	}
 
-	/* set basename() only */
-	pos = strrchr(argv[0], '/');
-	if (pos != NULL)
-		argv[0] = &pos[1];
-
 	retval = pipe(fds);
 	if (retval != 0) {
 		dbg("pipe failed");
@@ -503,7 +401,7 @@ static int execute_program(const char *path, char *value, int len)
 		dbg("result is '%s'", value);
 
 		close(fds[0]);
-		wait(&status);
+		waitpid(pid, &status, 0);
 
 		if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
 			dbg("exec program status 0x%x", status);
@@ -645,114 +543,8 @@ static int match_place(struct config_device *dev, struct sysfs_class_device *cla
 	return 0;
 }
 
-static int whitelist_search(struct sysfs_class_device *class_dev)
-{
-	char *sysblock = "/sys/block";
-  	int i;
-
-  	static char *list[] = {
-  		"nb",
-  		"ram",
-  		"loop",
-		"fd",
-  		"md",
-		"dos_cd",
-		"double",
-  		"flash",
-		"msd",
-		"rflash",
-  		"rom",
-		"rrom",
-  		"sbpcd",
-  		"pcd",
-  		"pf",
-  		"scd",
-  		"ubd",
-		NULL,
-  	};
-
-	if (strncmp(class_dev->path, sysblock, strlen(sysblock)))
-		return 0;
-
-	for (i=0; list[i] != NULL; i++)
-		if (!strncmp(class_dev->name, list[i], strlen(list[i])))
-			return 1;
-
-	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;
-
-	/* 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.
-	 * The main block device will have the device symlink in it's path, but
-	 * all partitions have the symlink in its parent directory.
-	 * But we need to watch out for block devices that do not have parents, yet
-	 * look like a partition (fd0, loop0, etc.)  They all do not have a device
-	 * symlink yet.  We do sit and spin on waiting for them right now unless
-	 * they happen to be in the whitelist in which case we exit.
-	 */
-	class_dev_parent = sysfs_get_classdev_parent(class_dev);
-	if (class_dev_parent != NULL) 
-		dbg("given class device has a parent, use this instead");
-
-	tspec.tv_sec = 0;
-	tspec.tv_nsec = 10000000;  /* sleep 10 millisec */
-	loop = 10;
-	while (loop--) {
-		if (udev_sleep) {
-			if (whitelist_search(class_dev)) {
-				sysfs_device = NULL;
-				goto exit;
-			}
-			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);
-		if (sysfs_device != NULL)
-			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 :(
-	 */
-        if (sysfs_device) {
-		if (sysfs_device->bus[0] != '\0')
-			goto bus_found;
-
-		loop = 10;
-		tspec.tv_nsec = 10000000;
-		while (loop--) {
-			if (udev_sleep)
-				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;
-}
-
-static int match_rule(struct config_device *dev, struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+static int match_rule(struct udevice *udev, struct config_device *dev,
+		      struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
 	while (1) {
 		/* check for matching bus value */
@@ -761,7 +553,8 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 				dbg("device has no bus");
 				goto try_parent;
 			}
-			dbg("check for " FIELD_BUS " dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
+			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 try_parent;
@@ -770,9 +563,10 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 			}
 		}
 
-		/* check for matching kernel name*/
+		/* 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);
+			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 try_parent;
@@ -781,6 +575,30 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 			}
 		}
 
+		/* check for matching subsystem */
+		if (dev->subsystem[0] != '\0') {
+			dbg("check for " FIELD_SUBSYSTEM " dev->subsystem='%s' class_dev->name='%s'",
+			    dev->subsystem, class_dev->name);
+			if (strcmp_pattern(dev->subsystem, udev->subsystem) != 0) {
+				dbg(FIELD_SUBSYSTEM " is not matching");
+				goto try_parent;
+			} else {
+				dbg(FIELD_SUBSYSTEM " matches");
+			}
+		}
+
+		/* check for matching driver */
+		if (dev->driver[0] != '\0') {
+			dbg("check for " FIELD_DRIVER " dev->driver='%s' sysfs_device->driver_name='%s'",
+			    dev->driver, sysfs_device->driver_name);
+			if (strcmp_pattern(dev->driver, sysfs_device->driver_name) != 0) {
+				dbg(FIELD_DRIVER " is not matching");
+				goto try_parent;
+			} else {
+				dbg(FIELD_DRIVER " matches");
+			}
+		}
+
 		/* check for matching bus id */
 		if (dev->id[0] != '\0') {
 			dbg("check " FIELD_ID);
@@ -821,7 +639,7 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 			dbg("check " FIELD_PROGRAM);
 			strfieldcpy(program, dev->program);
 			apply_format(udev, program, sizeof(program), class_dev, sysfs_device);
-			if (execute_program(program, udev->program_result, NAME_SIZE) != 0) {
+			if (execute_program(udev, program, udev->program_result, NAME_SIZE) != 0) {
 				dbg(FIELD_PROGRAM " returned nonzero");
 				goto try_parent;
 			} else {
@@ -831,8 +649,7 @@ static int match_rule(struct config_device *dev, struct sysfs_class_device *clas
 
 		/* check for matching result of external program */
 		if (dev->result[0] != '\0') {
-			dbg("check for " FIELD_RESULT
-			    " dev->result='%s', udev->program_result='%s'",
+			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");
@@ -852,31 +669,37 @@ try_parent:
 			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);
 	}
 
 }
 
-int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *udev)
+int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_dev)
 {
+	struct sysfs_class_device *class_dev_parent;
 	struct sysfs_device *sysfs_device = NULL;
 	struct config_device *dev;
-	struct perm_device *perm;
-	struct sysinfo info;
 	char *pos;
 
-	udev->mode = 0;
+	dbg("class_dev->name='%s'", class_dev->name);
+
+	/* Figure out where the "device"-symlink is at.  For char devices this will
+	 * always be in the class_dev->path.  On block devices, only the main block
+	 * device will have the device symlink in it's path. All partition devices
+	 * need to look at the symlink in its parent directory.
+	 */
+	class_dev_parent = sysfs_get_classdev_parent(class_dev);
+	if (class_dev_parent != NULL) {
+		dbg("given class device has a parent, use this instead");
+		sysfs_device = sysfs_get_classdev_device(class_dev_parent);
+	} else {
+		sysfs_device = sysfs_get_classdev_device(class_dev);
+	}
 
-	/* find the sysfs_device associated with this class device */
-	sysfs_device = get_sysfs_device(class_dev);
 	if (sysfs_device) {
-		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("found devices device: path='%s', bus_id='%s', bus='%s'",
+		    sysfs_device->path, sysfs_device->bus_id, sysfs_device->bus);
 		strfieldcpy(udev->bus_id, sysfs_device->bus_id);
-		wait_for_device_to_initialize(sysfs_device);
 	}
-	dbg("class_dev->name = '%s'", class_dev->name);
 
 	strfieldcpy(udev->kernel_name, class_dev->name);
 	fix_kernel_name(udev);
@@ -892,17 +715,37 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 	/* 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) {
+		if (match_rule(udev, dev, class_dev, sysfs_device) == 0) {
 			if (dev->name[0] == '\0' && dev->symlink[0] == '\0') {
-				info("configured rule in '%s' at line %i applied, '%s' is ignored",
-				     dev->config_file, dev->config_line, udev->kernel_name);
-				return -1;
+				/* empty name, symlink, perms will not create any node */
+				if (dev->mode == 0000 && dev->owner[0] == '\0' && dev->group[0] == '\0') {
+					info("configured rule in '%s[%i]' applied, '%s' is ignored",
+					     dev->config_file, dev->config_line, udev->kernel_name);
+					return -1;
+				}
+
+				/* apply permissions only rule values */
+				if (dev->mode != 0000) {
+					udev->mode = dev->mode;
+					dbg("applied mode=%#o to '%s'", udev->mode, udev->kernel_name);
+				}
+				if (dev->owner[0] != '\0') {
+					strfieldcpy(udev->owner, dev->owner);
+					apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device);
+					dbg("applied owner='%s' to '%s'", udev->owner, udev->kernel_name);
+				}
+				if (dev->group[0] != '\0') {
+					strfieldcpy(udev->group, dev->group);
+					apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device);
+					dbg("applied group='%s' to '%s'", udev->group, udev->kernel_name);
+				}
 			}
 
+			/* collect symlinks for the final matching rule */
 			if (dev->symlink[0] != '\0') {
 				char temp[NAME_SIZE];
 
-				info("configured rule in '%s' at line %i applied, added symlink '%s'",
+				info("configured rule in '%s[%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);
@@ -911,78 +754,49 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
 				strfieldcat(udev->symlink, temp);
 			}
 
+			/* rule matches */
 			if (dev->name[0] != '\0') {
 				/* apply all_partitions flag only at a main block device */
 				if (dev->partitions > 0 &&
 				    (udev->type != 'b' || udev->kernel_number[0] != '\0'))
 					continue;
 
-				info("configured rule in '%s' at line %i applied, '%s' becomes '%s'",
+				info("configured rule in '%s[%i]' applied, '%s' becomes '%s'",
 				     dev->config_file, dev->config_line, udev->kernel_name, dev->name);
+
 				strfieldcpy(udev->name, dev->name);
-				goto found;
+				apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
+				strfieldcpy(udev->config_file, dev->config_file);
+				udev->config_line = dev->config_line;
+				udev->ignore_remove = dev->ignore_remove;
+
+				if (udev->type == 'n')
+					goto exit;
+
+				udev->partitions = dev->partitions;
+				if (dev->mode != 0000)
+					udev->mode = dev->mode;
+				if (dev->owner[0] != '\0') {
+					strfieldcpy(udev->owner, dev->owner);
+					apply_format(udev, udev->owner, sizeof(udev->owner), class_dev, sysfs_device);
+				}
+				if (dev->group[0] != '\0') {
+					strfieldcpy(udev->group, dev->group);
+					apply_format(udev, udev->group, sizeof(udev->group), class_dev, sysfs_device);
+				}
+
+				dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
+				    udev->name, udev->owner, udev->group, udev->mode);
+
+				goto exit;
 			}
 		}
 	}
-	/* no rule was found so we use the kernel name */
-	strfieldcpy(udev->name, udev->kernel_name);
-	if (udev->type == 'n')
-		goto done;
-	else
-		goto perms;
-
-found:
-	apply_format(udev, udev->name, sizeof(udev->name), class_dev, sysfs_device);
-	strfieldcpy(udev->config_file, dev->config_file);
-	udev->config_line = dev->config_line;
-
-	if (udev->type == 'n')
-		goto done;
-
-	udev->partitions = dev->partitions;
-
-	/* get permissions given in rule */
-	set_empty_perms(udev, dev->mode,
-			      dev->owner,
-			      dev->group);
-
-perms:
-	/* get permissions given in config file or set defaults */
-	perm = find_perm(udev->name);
-	if (perm != NULL) {
-		set_empty_perms(udev, perm->mode,
-				      perm->owner,
-				      perm->group);
-	} else {
-		set_empty_perms(udev, get_default_mode(),
-				      get_default_owner(),
-				      get_default_group());
-	}
-
-	dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
-	    udev->name, udev->owner, udev->group, udev->mode);
 
-done:
-	/* store time of action */
-	sysinfo(&info);
-	udev->config_uptime = info.uptime;
+	/* no rule matched, so we use the kernel name */
+	strfieldcpy(udev->name, udev->kernel_name);
+	dbg("no rule found, use kernel name '%s'", udev->name);
 
+exit:
 	return 0;
 }
-
-int namedev_init(void)
-{
-	int retval;
-
-	retval = namedev_init_rules();
-	if (retval)
-		return retval;
-
-	retval = namedev_init_permissions();
-	if (retval)
-		return retval;
-
-	dump_config_dev_list();
-	dump_perm_dev_list();
-	return retval;
-}