From: Nathaniel Clark <nclark@whamcloud.com>
Date: Wed, 24 Oct 2018 19:49:39 +0000 (-0400)
Subject: LU-11563 build: Only add l_tunedisk udev rule to server
X-Git-Tag: 2.12.0-RC1~93
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=0d11a314787bc795797a016262e9bcfe86e2193e;ds=sidebyside

LU-11563 build: Only add l_tunedisk udev rule to server

Split LU-9551 patch off into server only udev rules.
It just spits errors on the client since l_tunedisk is a server-side
only tool.

Test-Parameters: trivial
Signed-off-by: Nathaniel Clark <nclark@whamcloud.com>
Change-Id: Iee426588bcce611dc913cf89a4bcb733c364482b
Reviewed-on: https://review.whamcloud.com/33466
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <jhammond@whamcloud.com>
Reviewed-by: Jay J Lan <jay.j.lan@nasa.gov>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre.spec.in b/lustre.spec.in
index f4f4acc..322c0fa 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -476,6 +476,9 @@ echo '%{_sbindir}/wiretest' >>lustre-tests.files
 %{_includedir}/linux/lustre
 %endif
 %{_sysconfdir}/udev/rules.d/99-lustre.rules
+%if %{with servers}
+%{_sysconfdir}/udev/rules.d/99-lustre-server.rules
+%endif
 %if %{with zfs}
 %config(noreplace) %{_sysconfdir}/ldev.conf
 %endif
diff --git a/lustre/conf/99-lustre-server.rules b/lustre/conf/99-lustre-server.rules
new file mode 100644
index 0000000..fdd21ec
--- /dev/null
+++ b/lustre/conf/99-lustre-server.rules
@@ -0,0 +1,3 @@
+# Ensure block devices re-added to the system allow for large writes (LU-9551)
+ACTION=="add|change", SUBSYSTEM=="block", RUN+="/usr/sbin/l_tunedisk /dev/%k"
+
diff --git a/lustre/conf/99-lustre.rules b/lustre/conf/99-lustre.rules
index 62b5cb8..c5632f6 100644
--- a/lustre/conf/99-lustre.rules
+++ b/lustre/conf/99-lustre.rules
@@ -1,7 +1,4 @@
 KERNEL=="obd", MODE="0666"
 
-# Ensure block devices re-added to the system allow for large writes (LU-9551)
-ACTION=="add|change", SUBSYSTEM=="block", RUN+="/usr/sbin/l_tunedisk /dev/%k"
-
 # set sysfs values on client
 SUBSYSTEM=="lustre", ACTION=="change", ENV{PARAM}=="?*", RUN+="/usr/sbin/lctl set_param '$env{PARAM}=$env{SETTING}'"
diff --git a/lustre/conf/Makefile.am b/lustre/conf/Makefile.am
index 634b344..b6d2730 100644
--- a/lustre/conf/Makefile.am
+++ b/lustre/conf/Makefile.am
@@ -37,7 +37,7 @@ DIST_SUBDIRS = resource
 
 EXTRA_DIST = lustre.dtd lustre2ldif.xsl top.ldif \
              99-lustre.rules lustre ldev.conf ko2iblnd.conf lsvcgss \
-             lnet_routes.conf lnet.conf lgssc.conf
+             lnet_routes.conf lnet.conf lgssc.conf 99-lustre-server.rules
 
 sysconf_DATA = lnet.conf
 
@@ -50,6 +50,7 @@ udevrulesdir = $(sysconfdir)/udev/rules.d
 udevrules_DATA = 99-lustre.rules
 
 if SERVER
+udevrules_DATA += 99-lustre-server.rules
 if ZFS_ENABLED
 sysconf_DATA += ldev.conf
 endif