pool/nbd
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 827631 from home:dimstar:Factory

Browse Source 
- Fix wrong usage of %{_libexecdir} for systemd/firewalld owned
  paths.

OBS-URL: https://build.opensuse.org/request/show/827631
OBS-URL: https://build.opensuse.org/package/show/network:utilities/nbd?expand=0&rev=69
This commit is contained in:
Martin Pluskal 2020-08-19 06:01:33 +00:00 committed by Git OBS Bridge
parent b71bbfab30
commit cbac194725
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nbd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Aug 18 15:27:46 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Fix wrong usage of %{_libexecdir} for systemd/firewalld owned
paths.
-------------------------------------------------------------------
Wed Mar 18 10:36:55 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>

16
nbd.spec
View File

@ -86,8 +86,8 @@ install -D -p -m 0644 %{SOURCE1} \
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}-server
# autoload nbd module
install -d -m 755 %{buildroot}%{_libexecdir}/modules-load.d/
echo "nbd" > %{buildroot}%{_libexecdir}/modules-load.d/%{name}.conf
install -d -m 755 %{buildroot}%{_prefix}/lib/modules-load.d/
echo "nbd" > %{buildroot}%{_prefix/lib}/modules-load.d/%{name}.conf
#echo "#Port file options" > $RPM_BUILD_ROOT/etc/nbd-server.conf
mkdir -p %{buildroot}%{_sysconfdir}/nbd-server
@ -98,7 +98,7 @@ install -D -p -m 0644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.%{name}-ser
# install firewall information file
%if %{use_firewalld}
install -D -m 644 %{SOURCE10} %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml
install -D -m 644 %{SOURCE10} %{buildroot}%{_prefix}/lib/firewalld/services/%{name}.xml
%endif
%post
@ -155,13 +155,13 @@ fi
%ghost %config(noreplace) %{_sysconfdir}/nbd-server/config
%ghost %config(noreplace) %{_sysconfdir}/nbd-server/allow
%config %{_sysconfdir}/nbd-server/config.example
%dir %{_libexecdir}/modules-load.d/
%{_libexecdir}/modules-load.d/nbd.conf
%dir %{_prefix}/lib/modules-load.d/
%{_prefix}/lib/modules-load.d/nbd.conf
%{_fillupdir}/sysconfig.%{name}-server
%if %{use_firewalld}
%dir %{_libexecdir}/firewalld
%dir %{_libexecdir}/firewalld/services
%{_libexecdir}/firewalld/services/%{name}.xml
%dir %{_prefix}/lib/firewalld
%dir %{_prefix}/lib/firewalld/services
%{_prefix}/lib/firewalld/services/%{name}.xml
%endif
%changelog