Create /var/run/samba with systemd-tmpfiles on post-12.2 systems;

(bnc#856759).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=359
This commit is contained in:
Lars Müller 2014-01-06 14:26:34 +00:00 committed by Git OBS Bridge
parent 86d14d5f08
commit 3e4c02b2ab
4 changed files with 20 additions and 6 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d5d3c49b5661192f98eb5f1a3f204db692b8db8d02f56a55657d9f97ecb9e33f
size 71251
oid sha256:53d61b21f0629595db21720d714e1943561d5a63238a7227181a05f5c1082327
size 71356

View File

@ -1,8 +1,14 @@
-------------------------------------------------------------------
Mon Jan 6 13:09:35 UTC 2014 - lmuelle@suse.com
- Create /var/run/samba with systemd-tmpfiles on post-12.2 systems;
(bnc#856759).
-------------------------------------------------------------------
Mon Jan 6 10:06:59 UTC 2014 - lmuelle@suse.com
- Fix broken rc{nmb,smb,winbind} sym links which should point to the service
binary on post-12.2 systems.
binary on post-12.2 systems; (bnc#856759).
-------------------------------------------------------------------
Mon Jan 6 07:01:48 UTC 2014 - ddiss@suse.com

View File

@ -135,7 +135,7 @@ BuildRequires: systemd
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
%define SOURCE_TIMESTAMP 3134
%define SOURCE_TIMESTAMP 3136
%define BRANCH %{version}
%global with_mitkrb5 1
%global with_dc 0
@ -1357,6 +1357,8 @@ for srv_name in nmb smb winbind; do
>%{buildroot}/%{_unitdir}/${srv_name}.service
ln -s ../../%{_sbindir}/service %{buildroot}/%{_sbindir}/rc${srv_name}
done
install -d -m 0755 %{buildroot}%{_prefix}/lib/tmpfiles.d
install -m 0644 -p ../packaging/systemd/samba.conf.tmp %{buildroot}%{_prefix}/lib/tmpfiles.d/samba.conf
%else
for script in ${startScripts}; do
install -m 0755 "init/${script}${scriptSuffix}" \
@ -1510,6 +1512,7 @@ getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || :
%post
%if 0%{?suse_version} > 1220
%service_add_post nmb.service smb.service
%{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf
%endif
%postun
@ -1689,6 +1692,7 @@ else
fi
%if 0%{?suse_version} > 1220
%service_add_post winbind.service
%{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf
%endif
%preun winbind
@ -1772,6 +1776,10 @@ fi
%attr(0644,root,root) %{_datadir}/omc/svcinfo.d/smb.xml
%dir %{_datadir}/samba
%{_datadir}/samba/update-apparmor-samba-profile
%if 0%{?suse_version} > 1222
%dir %{_prefix}/lib/tmpfiles.d
%{_prefix}/lib/tmpfiles.d/samba.conf
%endif
%doc %{_mandir}/man1/smbstatus.1.*
%doc %{_mandir}/man5/smbpasswd.5.*
%doc %{_mandir}/man8/nmbd.8.*

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4ebfee767cbc6932582f78ad52c0e11576a9c7d3e73e85d0cca6ba2992626c88
size 54224
oid sha256:261b3e0d258e6b201212ffae6eed9f51ba59f63afc6b3659f50d15f50e35c568
size 54151