LU-12017 ldlm: DoM truncate deadlock

[fs/lustre-release.git] / lustre / scripts / Makefile.am

diff --git a/lustre/scripts/Makefile.am b/lustre/scripts/Makefile.am
index 25b9995..f834235 100644 (file)
--- a/lustre/scripts/Makefile.am
+++ b/lustre/scripts/Makefile.am
@@ -41,7 +41,7 @@ sbin_SCRIPTS = lustre_rmmod ko2iblnd-probe
 
 if RHEL
 initdir = $(sysconfdir)/init.d
-init_SCRIPTS  = lsvcgss
+init_SCRIPTS  =
 
 if !HAVE_SYSTEMD
 init_SCRIPTS += lnet
@@ -49,6 +49,9 @@ endif
 
 if SERVER
 init_SCRIPTS += lustre
+if GSS_KEYRING
+init_SCRIPTS += lsvcgss
+endif
 endif
 endif
 
@@ -63,6 +66,11 @@ bin_SCRIPTS  += lustre_req_history
 hadir = $(sysconfdir)/ha.d/resource.d
 ha_SCRIPTS = Lustre.ha_v2
 
+if ZFS_ENABLED
+zedletdir = $(sysconfdir)/zfs/zed.d/
+zedlet_SCRIPTS = statechange-lustre.sh
+endif
+
 scriptlibdir = @libexecdir@/@PACKAGE@
 scriptlib_SCRIPTS = haconfig
 scriptlib_DATA = lc_common
@@ -78,20 +86,11 @@ EXTRA_DIST = license-status lustre_rmmod ldev lc_mon lhbadm \
             lc_servip lustre_routes_config lustre_routes_conversion \
             $(addsuffix .in,$(genscripts)) lfs_migrate lustre_req_history \
             lustre lsvcgss lc_common haconfig Lustre.ha_v2 dkms.mkconf \
-            zfsobj2fid ko2iblnd-probe
+            zfsobj2fid ko2iblnd-probe statechange-lustre.sh
 
 CLEANFILES = $(genscripts)
 
 $(genscripts): %: %.in
-if BUILD_DLC
-       sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
-           -e 's,@scriptlibdir\@,$(scriptlibdir),g' \
-           -e 's,@BUILD_DLC_TRUE\@,,g' \
-           -e 's,@BUILD_DLC_FALSE\@,\#,g' $< > $@
-else
        sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
-           -e 's,@scriptlibdir\@,$(scriptlibdir),g' \
-           -e 's,@BUILD_DLC_TRUE\@,\#,g' \
-           -e 's,@BUILD_DLC_FALSE\@,,g' $< > $@
-endif
+           -e 's,@scriptlibdir\@,$(scriptlibdir),g' $< > $@
        chmod +x $@