respect prefix= setting when building udev.conf

PATCH New Kevin P. Fleming 1 participant 1 message Sep 16, 2004 Kbuild

Share & tools

Kevin P. Fleming

author

2004-09-16 18:51 UTC #0 lore raw

PATCH 1/1 respect prefix= setting when building udev.conf

The lines in the default udev.conf that point to /etc/udev/rules.d and /etc/udev/permissions.d don't respect the prefix= setting the user supplies when building udev.

The attached patch corrects this.

Submitted By: Kevin P. Fleming <[email protected]>
Date: 2004-09-16
Initial Package Version: 032
Origin: David Jensen (modified by KPF)
Description: correct udev's Makefile and template config file to respect the "prefix=" setting supplied when it is built

Makefile +1 -1

diff -ur udev-orig/Makefile udev-032/Makefile
@@ -244,7 +244,7 @@
 
 # Rules on how to create the generated config files
 $(LOCAL_CFG_DIR)/udev.conf:
-	sed -e "s:@udevdir@:$(udevdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
+	sed -e "s:@udevdir@:$(udevdir):" -e "s:@configdir@:$(configdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
 
 GEN_MANPAGES   = udev.8
 GEN_MANPAGESIN = udev.8.in

etc/udev/udev.conf.in +2 -2

diff -ur udev-orig/etc/udev/udev.conf.in udev-032/etc/udev/udev.conf.in
@@ -12,10 +12,10 @@
 udev_db="@udevdir@/.udev.tdb"
 
 # udev_rules - The name and location of the udev rules file
-udev_rules="/etc/udev/rules.d/"
+udev_rules="@configdir@/rules.d/"
 
 # udev_permissions - The name and location of the udev permission file
-udev_permissions="/etc/udev/permissions.d/"
+udev_permissions="@configdir@/permissions.d/"
 
 # default_mode - set the default mode for all nodes that have no
 #                explicit match in the permissions file