From 18a0d6522d06338c76d7706f4a246a37e232f31c Mon Sep 17 00:00:00 2001 From: "olh@suse.de" Date: Thu, 11 Dec 2003 08:00:40 -0800 Subject: [PATCH] use udevdir in udev.conf udevdir is a define, but udev.conf has a hardcoded path. Maybe this config file should be generated on the fly, like shown below. --- Makefile | 9 +++++---- udev.conf | 23 ----------------------- udev.conf.in | 23 +++++++++++++++++++++++ 3 files changed, 28 insertions(+), 27 deletions(-) delete mode 100644 udev.conf create mode 100644 udev.conf.in diff --git a/Makefile b/Makefile index 51087bc8c6..cdee7ac812 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM} EXTRAS= # place to put our device nodes -udevdir = ${prefix}/udev/ +udevdir = ${prefix}/udev # Comment out this line to build with something other # than the local version of klibc @@ -196,8 +196,8 @@ 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_ROOT \"$(udevdir)\" >> $@ - @echo \#define UDEV_DB \"$(udevdir)\.udev.tdb\" >> $@ + @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\" >> $@ @@ -212,7 +212,7 @@ $(ROOT): $(OBJS) clean: -find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \ | xargs rm -f - -rm -f core $(ROOT) $(GEN_HEADERS) + -rm -f core $(ROOT) $(GEN_HEADERS) udev.conf $(MAKE) -C klibc clean @for target in $(EXTRAS) ; do \ echo $$target ; \ @@ -271,6 +271,7 @@ install: install-dbus-policy all $(INSTALL) -d $(DESTDIR)$(hotplugdir) $(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT) $(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8 + sed -e "s-@udevdir@-$(udevdir)-" < udev.conf.in > udev.conf $(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir) $(INSTALL_DATA) udev.rules $(DESTDIR)$(configdir) $(INSTALL_DATA) udev.permissions $(DESTDIR)$(configdir) diff --git a/udev.conf b/udev.conf deleted file mode 100644 index c3f31a6aa7..0000000000 --- a/udev.conf +++ /dev/null @@ -1,23 +0,0 @@ -# udev.conf -# The main config file for udev -# -# This file can be used to override some of udev's default values -# for where it looks for files, and where it places device nodes. - - -# udev_root - where in the filesystem to place the device nodes -udev_root="/udev/" - -# udev_db - The name and location of the udev database. -udev_db="/udev/.udev.tdb" - -# udev_rules - The name and location of the udev rules file -udev_rules="/etc/udev/udev.rules" - -# udev_permissions - The name and location of the udev permission file -udev_permissions="/etc/udev/udev.permissions" - -# default_mode - set the default mode for all nodes that have no -# explicit match in the permissions file -default_mode="0600" - diff --git a/udev.conf.in b/udev.conf.in new file mode 100644 index 0000000000..d06b0b0698 --- /dev/null +++ b/udev.conf.in @@ -0,0 +1,23 @@ +# udev.conf +# The main config file for udev +# +# This file can be used to override some of udev's default values +# for where it looks for files, and where it places device nodes. + + +# udev_root - where in the filesystem to place the device nodes +udev_root="@udevdir@/" + +# udev_db - The name and location of the udev database. +udev_db="@udevdir@/.udev.tdb" + +# udev_rules - The name and location of the udev rules file +udev_rules="/etc/udev/udev.rules" + +# udev_permissions - The name and location of the udev permission file +udev_permissions="/etc/udev/udev.permissions" + +# default_mode - set the default mode for all nodes that have no +# explicit match in the permissions file +default_mode="0600" + -- cgit v1.2.3-54-g00ecf