[PATCH] put config files and database in /etc/udev by default

Can be overridden on the makefile line.
This commit is contained in:
greg@kroah.com 2003-10-15 23:50:13 -07:00 committed by Greg KH
parent c27e69116d
commit 6739707df5
5 changed files with 35 additions and 15 deletions

View File

@ -22,10 +22,16 @@ DEBUG = true
ROOT = udev ROOT = udev
VERSION = 0.2 VERSION = 003
INSTALL_DIR = /usr/local/bin INSTALL_DIR = /usr/local/bin
RELEASE_NAME = $(ROOT)-$(VERSION) RELEASE_NAME = $(ROOT)-$(VERSION)
# override this to make udev look in a different location for it's config files
PREFIX =
CONFIG_DIR = $(PREFIX)/etc/udev/
# place to put our device nodes
UDEV_DIR = /udev/
# Comment out this line to build with something other # Comment out this line to build with something other
# than the local version of klibc # than the local version of klibc
@ -135,7 +141,9 @@ GEN_HEADERS = udev_version.h
# Rules on how to create the generated header files # Rules on how to create the generated header files
udev_version.h: udev_version.h:
@echo \#define UDEV_VERSION \"$(VERSION)\" > $@ @echo \#define UDEV_VERSION \"$(VERSION)\" > $@
@echo \#define UDEV_CONFIG_DIR \"$(CONFIG_DIR)\" >> $@
@echo \#define UDEV_ROOT \"$(UDEV_DIR)\" >> $@
$(ROOT): $(GEN_HEADERS) $(OBJS) $(LIBSYSFS) $(TDB) $(ROOT): $(GEN_HEADERS) $(OBJS) $(LIBSYSFS) $(TDB)
@ -151,7 +159,7 @@ clean:
$(MAKE) -C libsysfs clean $(MAKE) -C libsysfs clean
$(MAKE) -C tdb clean $(MAKE) -C tdb clean
DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v CVS | grep -v "\.tar\.gz" | grep -v "\/\." | grep -v releases | grep -v BitKeeper | grep -v SCCS ) DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v CVS | grep -v "\.tar\.gz" | grep -v "\/\." | grep -v releases | grep -v BitKeeper | grep -v SCCS | grep -v ".tdb" )
DISTDIR := $(RELEASE_NAME) DISTDIR := $(RELEASE_NAME)
srcdir = . srcdir = .
release: $(DISTFILES) clean release: $(DISTFILES) clean

View File

@ -30,7 +30,6 @@ struct sysfs_class_device;
/* namedev config files */ /* namedev config files */
#define COMMENT_CHARACTER '#' #define COMMENT_CHARACTER '#'
#define NAMEDEV_CONFIG_ROOT "/home/greg/src/udev/"
#define NAMEDEV_CONFIG_PERMISSION_FILE "namedev.permissions" #define NAMEDEV_CONFIG_PERMISSION_FILE "namedev.permissions"
#define NAMEDEV_CONFIG_FILE "namedev.config" #define NAMEDEV_CONFIG_FILE "namedev.config"

16
udev.h
View File

@ -34,15 +34,23 @@
#define dbg(format, arg...) do { } while (0) #define dbg(format, arg...) do { } while (0)
#endif #endif
/* Parser needs it's own debugging statement, we usually don't care about this at all */
#ifdef DEBUG_PARSER
#define dbg_parse(format, arg...) \
do { \
log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
} while (0)
#else
#define dbg_parse(format, arg...) do { } while (0)
#endif
/* Lots of constants that should be in a config file sometime */
/* Where udev should create its device nodes, trailing / needed */
#define UDEV_ROOT "/udev/"
extern int log_message (int level, const char *format, ...) extern int log_message (int level, const char *format, ...)
__attribute__ ((format (printf, 2, 3))); __attribute__ ((format (printf, 2, 3)));
/* Lots of constants that should be in a config file sometime */
#define NAME_SIZE 100 #define NAME_SIZE 100
#define OWNER_SIZE 30 #define OWNER_SIZE 30
#define GROUP_SIZE 30 #define GROUP_SIZE 30

View File

@ -9,6 +9,9 @@
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include "udev_version.h"
#include "udev.h"
#include "namedev.h"
#include "udevdb.h" #include "udevdb.h"
#include "tdb/tdb.h" #include "tdb/tdb.h"
@ -63,9 +66,14 @@ static void udevdb_close(void)
*/ */
static int udevdb_open(int method) static int udevdb_open(int method)
{ {
udevdb = tdb_open(UDEVDB, 0, method, O_RDWR | O_CREAT, 0644); udevdb = tdb_open(UDEV_CONFIG_DIR UDEV_DB, 0, method, O_RDWR | O_CREAT, 0644);
if (udevdb == NULL) if (udevdb == NULL) {
return -1; if (method == UDEVDB_INTERNAL)
dbg("Unable to initialize in-memory database");
else
dbg("Unable to initialize database at %s", UDEV_CONFIG_DIR UDEV_DB);
return -EINVAL;
}
return 0; return 0;
} }

View File

@ -4,10 +4,7 @@
#ifndef _UDEVDB_H_ #ifndef _UDEVDB_H_
#define _UDEVDB_H_ #define _UDEVDB_H_
#include "namedev.h" #define UDEV_DB "udevdb.tdb"
#include "udev.h"
#define UDEVDB "/home/greg/src/udev/udevdb.tdb"
#define PATH_SIZE 256 #define PATH_SIZE 256