X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_config.c;h=c1af7c12ca8149c11e9981c79d19915d8e9e6d72;hp=b8c4ffc8edbfa0d2e23ea73b195f731042d8a992;hb=d69b2203c37d32bbfbd81153a1fc99b55b7b6cbb;hpb=b2c6818dc35f7b149bba7bf963d1a3afb8daa867

diff --git a/udev_config.c b/udev_config.c
index b8c4ffc8e..c1af7c12c 100644
--- a/udev_config.c
+++ b/udev_config.c
@@ -38,7 +38,6 @@
 /* global variables */
 char sysfs_path[PATH_SIZE];
 char udev_root[PATH_SIZE];
-char udev_db_path[PATH_SIZE];
 char udev_config_filename[PATH_SIZE];
 char udev_rules_filename[PATH_SIZE];
 int udev_log_priority;
@@ -107,7 +106,7 @@ static int parse_config_file(void)
 	int retval = 0;
 
 	if (file_map(udev_config_filename, &buf, &bufsize) != 0) {
-		err("can't open '%s' as config file", udev_config_filename);
+		err("can't open '%s' as config file: %s", udev_config_filename, strerror(errno));
 		return -ENODEV;
 	}
 
@@ -153,12 +152,6 @@ static int parse_config_file(void)
 			continue;
 		}
 
-		if (strcasecmp(variable, "udev_db") == 0) {
-			strlcpy(udev_db_path, value, sizeof(udev_db_path));
-			remove_trailing_chars(udev_db_path, '/');
-			continue;
-		}
-
 		if (strcasecmp(variable, "udev_rules") == 0) {
 			strlcpy(udev_rules_filename, value, sizeof(udev_rules_filename));
 			remove_trailing_chars(udev_rules_filename, '/');
@@ -180,7 +173,6 @@ void udev_init_config(void)
 	const char *env;
 
 	strcpy(udev_root, UDEV_ROOT);
-	strcpy(udev_db_path, UDEV_DB);
 	strcpy(udev_config_filename, UDEV_CONFIG_FILE);
 	strcpy(udev_rules_filename, UDEV_RULES_FILE);
 	udev_log_priority = LOG_ERR;
@@ -200,6 +192,12 @@ void udev_init_config(void)
 
 	parse_config_file();
 
+	env = getenv("UDEV_ROOT");
+	if (env) {
+		strlcpy(udev_root, env, sizeof(udev_root));
+		remove_trailing_chars(udev_root, '/');
+	}
+
 	env = getenv("UDEV_LOG");
 	if (env)
 		udev_log_priority = log_priority(env);
@@ -207,7 +205,6 @@ void udev_init_config(void)
 	dbg("sysfs_path='%s'", sysfs_path);
 	dbg("UDEV_CONFIG_FILE='%s'", udev_config_filename);
 	dbg("udev_root='%s'", udev_root);
-	dbg("udev_db='%s'", udev_db_path);
 	dbg("udev_rules='%s'", udev_rules_filename);
 	dbg("udev_log=%d", udev_log_priority);
 }