Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-11652 kernel: kernel update [SLES12 SP3 4.4.162-94.69]
[fs/lustre-release.git]
/
lustre.spec.in
diff --git
a/lustre.spec.in
b/lustre.spec.in
index
fdd1026
..
7fe7e9f
100644
(file)
--- a/
lustre.spec.in
+++ b/
lustre.spec.in
@@
-384,7
+384,6
@@
echo '%{_sysconfdir}/sysconfig/lustre' >>lustre.files
%if %{with gss_keyring}
echo '%{_sysconfdir}/init.d/lsvcgss' >>lustre.files
echo '%{_sysconfdir}/sysconfig/lsvcgss' >>lustre.files
%if %{with gss_keyring}
echo '%{_sysconfdir}/init.d/lsvcgss' >>lustre.files
echo '%{_sysconfdir}/sysconfig/lsvcgss' >>lustre.files
-echo '%config(noreplace) %{_sysconfdir}/request-key.d/lgssc.conf' >>lustre.files
%endif
%endif
%endif
%endif
@@
-392,10
+391,8
@@
echo '%config(noreplace) %{_sysconfdir}/request-key.d/lgssc.conf' >>lustre.files
echo '%{_sysconfdir}/init.d/lnet' >>lustre.files
%endif
%endif
echo '%{_sysconfdir}/init.d/lnet' >>lustre.files
%endif
%endif
-
-%if %{with servers}
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/ocf/resource.d/lustre/
-install -m 0755 contrib/scripts/pacemaker/* $RPM_BUILD_ROOT%{_prefix}/lib/ocf/resource.d/lustre/
+%if %{with gss_keyring}
+echo '%config(noreplace) %{_sysconfdir}/request-key.d/lgssc.conf' >>lustre.files
%endif
# fc18 needs 'x' permission for library files
%endif
# fc18 needs 'x' permission for library files
@@
-481,6
+478,9
@@
echo '%{_sbindir}/wiretest' >>lustre-tests.files
%{_includedir}/linux/lustre
%endif
%{_sysconfdir}/udev/rules.d/99-lustre.rules
%{_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
%if %{with zfs}
%config(noreplace) %{_sysconfdir}/ldev.conf
%endif