LU-4707 build: Don’t deploy the "lustre" init script on clients

Don’t deploy init scripts if they are not supported,
for example on none RedHat systems.

Don’t deploy the "lustre" and "ha.d" init scripts on clients.

Fix typo in lustre/scripts/lnet script.

Lustre-commit: 109e2da1b156cf038615513b838e18c8d6edf56f
Lustre-change: http://review.whamcloud.com/9535

Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Change-Id: I8ce4ce7aba8e8040ab1dc6b58efb43dcc9bf51ba
Reviewed-on: http://review.whamcloud.com/9940
Tested-by: Jenkins
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre.spec.in b/lustre.spec.in
index 3f2121b..6b5b6e7 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -334,11 +334,6 @@ elif [ -e ${llog_base}.o ]; then
   cp ${llog_base}.o $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/%{kmoddir}/kernel/fs/lustre
 fi
 
-# The .ha_v2 extension identifies the heartbeat resource agent as using
-# legacy syntax. Install a compatibility symlink to avoid conflicts when
-# newer-style agents are added.
-ln -s Lustre.ha_v2 $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d/Lustre
-
 # Create the pristine source directory.
 cd $RPM_BUILD_DIR/lustre-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/src
@@ -368,16 +363,29 @@ cat >lustre.files <<EOF
 %attr(-, root, root) %{_includedir}/lustre
 %attr(-, root, root) %{_includedir}/libcfs
 %attr(-, root, root) %{_libexecdir}/lustre/lc_common
+%attr(-, root, root) %{_libexecdir}/lustre/haconfig
 %attr(-, root, root) %{_sysconfdir}/udev/rules.d/99-lustre.rules
-%attr(-, root, root) %{_sysconfdir}/init.d/lnet
-%attr(-, root, root) %{_sysconfdir}/init.d/lustre
 %attr(-, root, root) %config(noreplace) %{_sysconfdir}/ldev.conf
-%attr(-, root, root) %{_sysconfdir}/sysconfig/lustre
-%attr(-, root, root) %{_libexecdir}/lustre/haconfig
-%attr(-, root, root) %{_sysconfdir}/ha.d/resource.d/Lustre.ha_v2
-%attr(-, root, root) %{_sysconfdir}/ha.d/resource.d/Lustre
 EOF
 
+%if %{with servers}
+# The .ha_v2 extension identifies the heartbeat resource agent as using
+# legacy syntax. Install a compatibility symlink to avoid conflicts when
+# newer-style agents are added.
+ln -s Lustre.ha_v2 $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d/Lustre
+echo '%attr(-, root, root) %{_sysconfdir}/ha.d/resource.d/Lustre.ha_v2' >>lustre.files
+echo '%attr(-, root, root) %{_sysconfdir}/ha.d/resource.d/Lustre' >>lustre.files
+
+if [ -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/lustre ]; then
+       echo '%attr(-, root, root) %{_sysconfdir}/sysconfig/lustre' >>lustre.files
+       echo '%attr(-, root, root) %{_sysconfdir}/init.d/lustre' >>lustre.files
+fi
+%endif
+
+if [ -f $RPM_BUILD_ROOT%{_sysconfdir}/init.d/lnet ]; then
+       echo '%attr(-, root, root) %{_sysconfdir}/init.d/lnet' >>lustre.files
+fi
+
 if [ -f $RPM_BUILD_ROOT%{_libdir}/libcfsutil.a ] ; then
   echo '%attr(-, root, root) %{_libdir}/libcfsutil.a' >>lustre.files
 fi

diff --git a/lustre/conf/Makefile.am b/lustre/conf/Makefile.am
index 2f25ba2..5797eed 100644 (file)
--- a/lustre/conf/Makefile.am
+++ b/lustre/conf/Makefile.am
@@ -46,7 +46,11 @@ endif
 udevrulesdir = $(sysconfdir)/udev/rules.d
 udevrules_DATA = 99-lustre.rules
 
+if INIT_SCRIPTS
+if SERVER
 sysconfigdir = $(sysconfdir)/sysconfig
 sysconfig_DATA = lustre
+endif
+endif
 
 sysconf_DATA = ldev.conf

diff --git a/lustre/scripts/Makefile.am b/lustre/scripts/Makefile.am
index 3d84d79..921bf75 100644 (file)
--- a/lustre/scripts/Makefile.am
+++ b/lustre/scripts/Makefile.am
@@ -41,11 +41,18 @@ sbinscripts += lustre_routes_config lustre_routes_conversion
 genscripts = lustre_config lc_modprobe lc_net lc_hb lc_cluman lustre_createcsv \
     lc_md lc_lvm lustre_start
 
+if INIT_SCRIPTS
 initdir = $(sysconfdir)/init.d
-init_SCRIPTS = lustre lnet
+init_SCRIPTS = lnet
+if SERVER
+init_SCRIPTS += lustre
+endif
+endif
 
+if SERVER
 hadir = $(sysconfdir)/ha.d/resource.d
 ha_SCRIPTS = Lustre.ha_v2
+endif
 
 sbin_SCRIPTS = $(genscripts) $(sbinscripts)
 bin_SCRIPTS = lustre_req_history lfs_migrate

diff --git a/lustre/scripts/lnet b/lustre/scripts/lnet
index 62cbb39..99f568d 100644 (file)
--- a/lustre/scripts/lnet
+++ b/lustre/scripts/lnet
@@ -6,7 +6,7 @@
 # chkconfig: - 59 76
 # description:  Part of the lustre file system.
 # probe: true
-# config: /etc/sysconfig/lustre
+# config: /etc/sysconfig/lnet
 
 # Source function library.
 [ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions