X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre.spec.in;h=7fe7e9fa862df7cca513c6708d128d9d58efe064;hp=6cf311d4c91f127d719fdc8b03d472f15ed656ed;hb=4d6bff6be51ff6e336f73b2822ac5100254b9431;hpb=6189ae07c5161d14c9e9f863a400045f923f2301 diff --git a/lustre.spec.in b/lustre.spec.in index 6cf311d..7fe7e9f 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -141,7 +141,7 @@ Source4: kmp-lustre-osd-ldiskfs.files Source5: kmp-lustre-osd-zfs.preamble Source6: kmp-lustre-osd-zfs.files Source7: kmp-lustre-tests.files -URL: https://wiki.hpdd.intel.com/ +URL: https://wiki.whamcloud.com/ BuildRoot: %{_tmppath}/lustre-%{version}-root Requires: %{requires_kmod_name} = %{requires_kmod_version} zlib Requires: %{requires_yaml_name} @@ -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 -echo '%config(noreplace) %{_sysconfdir}/request-key.d/lgssc.conf' >>lustre.files %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 - -%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 @@ -481,6 +478,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