From: Mr NeilBrown <neilb@suse.de>
Date: Mon, 13 Mar 2023 18:56:40 +0000 (-0400)
Subject: LU-16382 build: udev files in /usr/lib
X-Git-Tag: 2.15.55~42
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F69%2F49369%2F7;p=fs%2Flustre-release.git

LU-16382 build: udev files in /usr/lib

udev rules files should go in /usr/lib/udev/rules.d
/etc/udev/rules.d is meant for local configuration.

Test-Parameters: trivial
Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: I525d25c54903c25d19b5909231e21e7a3a717d9b
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49369
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre.spec.in b/lustre.spec.in
index 463ce1b..e21dc73 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -785,9 +785,9 @@ echo '%{_libdir}/lustre/tests/lutf/*' >>lustre-tests.files
 %if %{with shared}
 %{_libdir}/liblustreapi.so.*
 %endif
-%{_sysconfdir}/udev/rules.d/99-lustre.rules
+%{_udevrulesdir}/99-lustre.rules
 %if %{with servers}
-%{_sysconfdir}/udev/rules.d/99-lustre-server.rules
+%{_udevrulesdir}/99-lustre-server.rules
 %endif
 %if %{with zfs}
 %config(noreplace) %{_sysconfdir}/ldev.conf
diff --git a/lustre/conf/Makefile.am b/lustre/conf/Makefile.am
index 27ed72d..c54473b 100644
--- a/lustre/conf/Makefile.am
+++ b/lustre/conf/Makefile.am
@@ -47,7 +47,7 @@ endif
 
 firewallddir = ${prefix}/lib/firewalld/services
 firewalld_DATA = lustre.xml
-udevrulesdir = $(sysconfdir)/udev/rules.d
+udevrulesdir = $(prefix)/lib/udev/rules.d
 udevrules_DATA = 99-lustre.rules
 
 if SERVER