diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | namedev_parse.c | 6 | ||||
| -rw-r--r-- | test/label_test.rules | 3 | ||||
| -rw-r--r-- | test/modifier_test.rules | 3 | ||||
| -rw-r--r-- | test/replace_test.rules | 3 | ||||
| -rw-r--r-- | test/topo_test.rules | 3 | ||||
| -rw-r--r-- | udev.c | 10 | ||||
| -rw-r--r-- | udev.h | 10 | ||||
| -rw-r--r-- | udev_config.c | 50 |
9 files changed, 21 insertions, 73 deletions
@@ -174,8 +174,12 @@ GEN_HEADERS = udev_version.h # Rules on how to create the generated header files udev_version.h: @echo \#define UDEV_VERSION \"$(VERSION)\" > $@ - @echo \#define UDEV_CONFIG_DIR \"$(configdir)\" >> $@ @echo \#define UDEV_ROOT \"$(udevdir)\" >> $@ + @echo \#define UDEV_DB \"$(udevdir)\.udev.tdb\" >> $@ + @echo \#define UDEV_CONFIG_DIR \"$(configdir)\" >> $@ + @echo \#define UDEV_CONFIG_FILE \"$(configdir)\udev.conf\" >> $@ + @echo \#define UDEV_RULES_FILE \"$(configdir)\udev.rules\" >> $@ + @echo \#define UDEV_PERMISSION_FILE \"$(configdir)\udev.permissions\" >> $@ $(OBJS): $(GEN_HEADERS) diff --git a/namedev_parse.c b/namedev_parse.c index bd23867e18..a6a7d4b62e 100644 --- a/namedev_parse.c +++ b/namedev_parse.c @@ -346,11 +346,11 @@ int namedev_init_permissions(void) int retval = 0; struct config_device dev; - fd = fopen(udev_permission_filename, "r"); + fd = fopen(udev_permissions_filename, "r"); if (fd != NULL) { - dbg("reading '%s' as permissions file", udev_permission_filename); + dbg("reading '%s' as permissions file", udev_permissions_filename); } else { - dbg("can't open '%s' as permissions file", udev_permission_filename); + dbg("can't open '%s' as permissions file", udev_permissions_filename); return -ENODEV; } diff --git a/test/label_test.rules b/test/label_test.rules deleted file mode 100644 index a6d1c1cb3e..0000000000 --- a/test/label_test.rules +++ /dev/null @@ -1,3 +0,0 @@ -# LABEL test -LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="boot_disk%n" - diff --git a/test/modifier_test.rules b/test/modifier_test.rules deleted file mode 100644 index f63e02c3ac..0000000000 --- a/test/modifier_test.rules +++ /dev/null @@ -1,3 +0,0 @@ -# TOPO test -TOPOLOGY, BUS="scsi", place="0:0:0:0", NAME="Major:%M:minor:%m:kernelnumber:%n:bus:%b" - diff --git a/test/replace_test.rules b/test/replace_test.rules deleted file mode 100644 index 8fbfd18100..0000000000 --- a/test/replace_test.rules +++ /dev/null @@ -1,3 +0,0 @@ -# REPLACE test -REPLACE, KERNEL="ttyUSB0", NAME="visor" - diff --git a/test/topo_test.rules b/test/topo_test.rules deleted file mode 100644 index 72f03ee0b2..0000000000 --- a/test/topo_test.rules +++ /dev/null @@ -1,3 +0,0 @@ -# TOPO test -TOPOLOGY, BUS="scsi", place="0:0:0:0", NAME="first_disk%n" - @@ -39,16 +39,6 @@ char **main_argv; char **main_envp; -char sysfs_path[SYSFS_PATH_MAX]; -char udev_config_dir[PATH_MAX]; -char udev_root[PATH_MAX]; -char udev_db_filename[PATH_MAX+NAME_MAX]; -char udev_permission_filename[PATH_MAX+NAME_MAX]; -char udev_rules_filename[PATH_MAX+NAME_MAX]; -char udev_config_filename[PATH_MAX+NAME_MAX]; -char default_mode_str[NAME_MAX]; - - static inline char *get_action(void) { char *action; @@ -50,13 +50,6 @@ extern int log_message (int level, const char *format, ...) __attribute__ ((format (printf, 2, 3))); - -/* default filenames for the config and database files */ -#define UDEV_CONFIG_FILE "udev.conf" -#define UDEV_DB ".udev.tdb" -#define UDEV_RULES_FILE "udev.rules" -#define UDEV_PERMISSION_FILE "udev.permissions" - #define COMMENT_CHARACTER '#' #define NAME_SIZE 100 @@ -92,10 +85,9 @@ extern void udev_init_config(void); extern char **main_argv; extern char **main_envp; extern char sysfs_path[SYSFS_PATH_MAX]; -extern char udev_config_dir[PATH_MAX]; extern char udev_root[PATH_MAX]; extern char udev_db_filename[PATH_MAX+NAME_MAX]; -extern char udev_permission_filename[PATH_MAX+NAME_MAX]; +extern char udev_permissions_filename[PATH_MAX+NAME_MAX]; extern char udev_config_filename[PATH_MAX+NAME_MAX]; extern char udev_rules_filename[PATH_MAX+NAME_MAX]; diff --git a/udev_config.c b/udev_config.c index 262108dff7..074bd7b35b 100644 --- a/udev_config.c +++ b/udev_config.c @@ -39,10 +39,9 @@ /* global variables */ char sysfs_path[SYSFS_PATH_MAX]; -char udev_config_dir[PATH_MAX]; char udev_root[PATH_MAX]; char udev_db_filename[PATH_MAX+NAME_MAX]; -char udev_permission_filename[PATH_MAX+NAME_MAX]; +char udev_permissions_filename[PATH_MAX+NAME_MAX]; char udev_rules_filename[PATH_MAX+NAME_MAX]; char udev_config_filename[PATH_MAX+NAME_MAX]; char default_mode_str[NAME_MAX]; @@ -50,8 +49,14 @@ char default_mode_str[NAME_MAX]; static void init_variables(void) { + /* fill up the defaults. + * If any config values are specified, they will + * override these values. */ strfieldcpy(udev_root, UDEV_ROOT); - strfieldcpy(udev_config_dir, UDEV_CONFIG_DIR); + strfieldcpy(udev_db_filename, UDEV_DB); + strfieldcpy(udev_config_filename, UDEV_CONFIG_FILE); + strfieldcpy(udev_rules_filename, UDEV_RULES_FILE); + strfieldcpy(udev_permissions_filename, UDEV_PERMISSION_FILE); } #define set_var(_name, _var) \ @@ -109,7 +114,7 @@ static int parse_config_file(void) set_var("udev_root", udev_root); set_var("udev_db", udev_db_filename); set_var("udev_rules", udev_rules_filename); - set_var("udev_permissions", udev_permission_filename); + set_var("udev_permissions", udev_permissions_filename); set_var("default_mode", default_mode_str); } dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename, @@ -122,10 +127,6 @@ exit: static void get_dirs(void) { char *temp; - char *udev_db = UDEV_DB; - char *udev_config = UDEV_CONFIG_FILE; - char *udev_rules = UDEV_RULES_FILE; - char *udev_permission = UDEV_PERMISSION_FILE; int retval; retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX); @@ -139,51 +140,24 @@ static void get_dirs(void) temp = getenv("SYSFS_PATH"); if (temp) strfieldcpy(sysfs_path, temp); - temp = getenv("UDEV_CONFIG_DIR"); - if (temp) - strfieldcpy(udev_config_dir, temp); - temp = getenv("UDEV_ROOT"); - if (temp) - strfieldcpy(udev_root, temp); - temp = getenv("UDEV_DB"); - if (temp) - udev_db = temp; temp = getenv("UDEV_CONFIG_FILE"); if (temp) - udev_config = temp; - temp = getenv("UDEV_RULES_FILE"); - if (temp) - udev_rules = temp; - temp = getenv("UDEV_PERMISSION_FILE"); - if (temp) - udev_permission = temp; + strfieldcpy(udev_config_filename, temp); } dbg("sysfs_path='%s'", sysfs_path); - strncpy(udev_db_filename, udev_root, sizeof(udev_db_filename)); - strncat(udev_db_filename, udev_db, sizeof(udev_db_filename)); - - strncpy(udev_config_filename, udev_config_dir, sizeof(udev_config_filename)); - strncat(udev_config_filename, udev_config, sizeof(udev_config_filename)); - - strncpy(udev_rules_filename, udev_config_dir, sizeof(udev_permission_filename)); - strncat(udev_rules_filename, udev_rules, sizeof(udev_permission_filename)); - - strncpy(udev_permission_filename, udev_config_dir, sizeof(udev_permission_filename)); - strncat(udev_permission_filename, udev_permission, sizeof(udev_permission_filename)); - dbg_parse("udev_root = %s", udev_root); dbg_parse("udev_config_filename = %s", udev_config_filename); dbg_parse("udev_db_filename = %s", udev_db_filename); dbg_parse("udev_rules_filename = %s", udev_rules_filename); - dbg_parse("udev_permission_filename = %s", udev_permission_filename); + dbg_parse("udev_permissions_filename = %s", udev_permissions_filename); parse_config_file(); dbg_parse("udev_root = %s", udev_root); dbg_parse("udev_config_filename = %s", udev_config_filename); dbg_parse("udev_db_filename = %s", udev_db_filename); dbg_parse("udev_rules_filename = %s", udev_rules_filename); - dbg_parse("udev_permission_filename = %s", udev_permission_filename); + dbg_parse("udev_permissions_filename = %s", udev_permissions_filename); } void udev_init_config(void) |