X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_config.c;h=204827407d389ff4388d564db77c1a815ede064d;hp=192a0b80d2e6055c06f93595c0eb217f909750cc;hb=f83cccb9798d6ce70c6cc39d2100794813b3615b;hpb=ff3e4bed21aaff673284f2e024da26c1e39cfda6

diff --git a/udev_config.c b/udev_config.c
index 192a0b80d..204827407 100644
--- a/udev_config.c
+++ b/udev_config.c
@@ -28,17 +28,10 @@
 #include <ctype.h>
 #include <syslog.h>
 
-#include "libsysfs/sysfs/libsysfs.h"
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_utils.h"
-#include "udev_version.h"
-#include "logging.h"
 
 /* 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;
@@ -143,7 +136,7 @@ static int parse_config_file(void)
 		linepos = line;
 		retval = get_key(&linepos, &variable, &value);
 		if (retval != 0) {
-			err("error parsing %s, line %d:%d", udev_config_filename, lineno, (int) (linepos-line));
+			err("error parsing %s, line %d:%d", udev_config_filename, lineno, (int)(linepos-line));
 			continue;
 		}
 
@@ -153,12 +146,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, '/');
@@ -175,17 +162,15 @@ static int parse_config_file(void)
 	return retval;
 }
 
-void udev_init_config(void)
+void udev_config_init(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;
 	udev_run = 1;
-	sysfs_get_mnt_path(sysfs_path, sizeof(sysfs_path));
 
 	/* disable RUN key execution */
 	env = getenv("UDEV_RUN");
@@ -200,14 +185,18 @@ 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);
 
-	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);
 }