chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct typo in extras/scsi_id/scsi_id.conf
[elogind.git]
/
udev_config.c
diff --git
a/udev_config.c
b/udev_config.c
index 7037a1708169a2135931cf9fde890f841e9f5b12..3f226b9d7cd2f0e21a9ca3b1cdb56459dcbb37ff 100644
(file)
--- a/
udev_config.c
+++ b/
udev_config.c
@@
-1,8
+1,6
@@
/*
/*
- * udev_config.c
- *
- * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2004, 2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-15,7
+13,7
@@
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
- *
675 Mass Ave, Cambridge, MA 02139
, USA.
+ *
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA.
*
*/
*
*/
@@
-28,18
+26,12
@@
#include <ctype.h>
#include <syslog.h>
#include <ctype.h>
#include <syslog.h>
-#include "libsysfs/sysfs/libsysfs.h"
-#include "udev_libc_wrapper.h"
#include "udev.h"
#include "udev.h"
-#include "udev_utils.h"
-#include "udev_version.h"
-#include "logging.h"
/* global variables */
/* global variables */
-char sysfs_path[PATH_SIZE];
char udev_root[PATH_SIZE];
char udev_config_filename[PATH_SIZE];
char udev_root[PATH_SIZE];
char udev_config_filename[PATH_SIZE];
-char udev_rules_
filename
[PATH_SIZE];
+char udev_rules_
dir
[PATH_SIZE];
int udev_log_priority;
int udev_run;
int udev_log_priority;
int udev_run;
@@
-142,7
+134,7
@@
static int parse_config_file(void)
linepos = line;
retval = get_key(&linepos, &variable, &value);
if (retval != 0) {
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;
}
continue;
}
@@
-153,8
+145,8
@@
static int parse_config_file(void)
}
if (strcasecmp(variable, "udev_rules") == 0) {
}
if (strcasecmp(variable, "udev_rules") == 0) {
- strlcpy(udev_rules_
filename, value, sizeof(udev_rules_filename
));
- remove_trailing_chars(udev_rules_
filename
, '/');
+ strlcpy(udev_rules_
dir, value, sizeof(udev_rules_dir
));
+ remove_trailing_chars(udev_rules_
dir
, '/');
continue;
}
continue;
}
@@
-168,16
+160,15
@@
static int parse_config_file(void)
return retval;
}
return retval;
}
-void udev_
init_config
(void)
+void udev_
config_init
(void)
{
const char *env;
strcpy(udev_root, UDEV_ROOT);
strcpy(udev_config_filename, UDEV_CONFIG_FILE);
{
const char *env;
strcpy(udev_root, UDEV_ROOT);
strcpy(udev_config_filename, UDEV_CONFIG_FILE);
- strcpy(udev_rules_
filename, UDEV_RULES_FILE
);
+ strcpy(udev_rules_
dir, UDEV_RULES_DIR
);
udev_log_priority = LOG_ERR;
udev_run = 1;
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");
/* disable RUN key execution */
env = getenv("UDEV_RUN");
@@
-192,13
+183,18
@@
void udev_init_config(void)
parse_config_file();
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);
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_CONFIG_FILE='%s'", udev_config_filename);
dbg("udev_root='%s'", udev_root);
- dbg("udev_rules='%s'", udev_rules_
filename
);
+ dbg("udev_rules='%s'", udev_rules_
dir
);
dbg("udev_log=%d", udev_log_priority);
}
dbg("udev_log=%d", udev_log_priority);
}