aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorKyle Fuller <[email protected]>2011-08-05 20:22:58 +0100
committerBrian Behlendorf <[email protected]>2011-08-08 16:21:10 -0700
commit12d06bac9b22b11d8a322dfea4bdb50b106c254f (patch)
treed3014ec1f682731484091506966b2032d2396f8a /cmd
parentf3ab88d6461dec46dea240763843f66300facfab (diff)
Move udev rules from /etc/udev to /lib/udev
This change moves the default install location for the zfs udev rules from /etc/udev/ to /lib/udev/. The correct convention is for rules provided by a package to be installed in /lib/udev/. The /etc/udev/ directory is reserved for custom rules or local overrides. Additionally, this patch cleans up some abuse of the bindir install location by adding a udevdir and udevruledir install directories. This allows us to revert to the default bin install location. The udev install directories can be set with the following new options. --with-udevdir=DIR install udev helpers [EPREFIX/lib/udev] --with-udevruledir=DIR install udev rules [UDEVDIR/rules.d] Signed-off-by: Brian Behlendorf <[email protected]> Closes #356
Diffstat (limited to 'cmd')
-rw-r--r--cmd/sas_switch_id/Makefile.am2
-rw-r--r--cmd/zpool_id/Makefile.am2
-rw-r--r--cmd/zvol_id/Makefile.am2
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/sas_switch_id/Makefile.am b/cmd/sas_switch_id/Makefile.am
index 092766369..b666bea0a 100644
--- a/cmd/sas_switch_id/Makefile.am
+++ b/cmd/sas_switch_id/Makefile.am
@@ -1 +1 @@
-dist_bin_SCRIPTS = sas_switch_id
+dist_udev_SCRIPTS = sas_switch_id
diff --git a/cmd/zpool_id/Makefile.am b/cmd/zpool_id/Makefile.am
index 023e1ab59..5f492cfd7 100644
--- a/cmd/zpool_id/Makefile.am
+++ b/cmd/zpool_id/Makefile.am
@@ -1 +1 @@
-dist_bin_SCRIPTS = zpool_id
+dist_udev_SCRIPTS = zpool_id
diff --git a/cmd/zvol_id/Makefile.am b/cmd/zvol_id/Makefile.am
index dcdea58b9..88ece6b19 100644
--- a/cmd/zvol_id/Makefile.am
+++ b/cmd/zvol_id/Makefile.am
@@ -4,7 +4,7 @@ DEFAULT_INCLUDES += \
-I$(top_srcdir)/include \
-I$(top_srcdir)/lib/libspl/include
-bin_PROGRAMS = zvol_id
+udev_PROGRAMS = zvol_id
zvol_id_SOURCES = \
$(top_srcdir)/cmd/zvol_id/zvol_id_main.c