summaryrefslogtreecommitdiff
path: root/udev.h
diff options
context:
space:
mode:
authorgreg@kroah.com <greg@kroah.com>2003-12-03 01:08:46 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:13:05 -0700
commite8bacccab296d6b75c4c9f43cb4e71007aff5b8a (patch)
treead65d8917550ec7e8addf84816e16452fd722986 /udev.h
parent[PATCH] turn debugging messages off by default. (diff)
downloadsystemd-e8bacccab296d6b75c4c9f43cb4e71007aff5b8a.tar.gz
systemd-e8bacccab296d6b75c4c9f43cb4e71007aff5b8a.tar.bz2
systemd-e8bacccab296d6b75c4c9f43cb4e71007aff5b8a.zip
[PATCH] add support for a main udev config file, udev.conf.
the older udev.config file is now called udev.rules. This allows us to better control configuration values, and move away from the environment variables.
Diffstat (limited to 'udev.h')
-rw-r--r--udev.h17
1 files changed, 11 insertions, 6 deletions
diff --git a/udev.h b/udev.h
index 0c1951ad7..4acbb6139 100644
--- a/udev.h
+++ b/udev.h
@@ -51,10 +51,13 @@ extern int log_message (int level, const char *format, ...)
__attribute__ ((format (printf, 2, 3)));
-/* filenames for the config and database files */
+/* default filenames for the config and database files */
+#define UDEV_CONFIG_FILE "udev.conf"
#define UDEV_DB ".udev.tdb"
-#define UDEV_CONFIG_PERMISSION_FILE "udev.permissions"
-#define UDEV_CONFIG_FILE "udev.config"
+#define UDEV_RULES_FILE "udev.rules"
+#define UDEV_PERMISSION_FILE "udev.permissions"
+
+#define COMMENT_CHARACTER '#'
#define NAME_SIZE 100
#define OWNER_SIZE 30
@@ -84,14 +87,16 @@ do { \
extern int udev_add_device(char *path, char *subsystem);
extern int udev_remove_device(char *path, char *subsystem);
+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;
-extern char *udev_root;
+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_config_permission_filename[PATH_MAX+NAME_MAX];
+extern char udev_permission_filename[PATH_MAX+NAME_MAX];
extern char udev_config_filename[PATH_MAX+NAME_MAX];
+extern char udev_rules_filename[PATH_MAX+NAME_MAX];
#endif