- fix pid files location in systemd service files

diff --git a/samba4.spec b/samba4.spec
index 03be21d014a437464f888be0a17758a306613bb1..9551d9aa65f48e12b26fb1f3aa2a30ff5d6437e5 100644 (file)
--- a/samba4.spec
+++ b/samba4.spec
@@ -45,6 +45,7 @@ Patch1:               samba-c++-nofail.patch
 Patch3:                samba-nscd.patch
 Patch4:                samba-lprng-no-dot-printers.patch
 Patch5:                samba-fam.patch
+Patch6:                systemd-pid-dir.patch
 URL:           http://www.samba.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -712,6 +713,7 @@ Ten pakiet zawiera schemat samby dla openldap-a.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 LDFLAGS="${LDFLAGS:-%rpmldflags}" \

diff --git a/systemd-pid-dir.patch b/systemd-pid-dir.patch
new file mode 100644 (file)
index 0000000..086632f
--- /dev/null
+++ b/systemd-pid-dir.patch
@@ -0,0 +1,44 @@
+--- samba-4.0.5/packaging/systemd/nmb.service~ 2012-10-16 09:33:05.000000000 +0200
++++ samba-4.0.5/packaging/systemd/nmb.service  2013-04-11 13:13:21.950445513 +0200
+@@ -4,7 +4,7 @@
+ 
+ [Service]
+ Type=forking
+-PIDFile=/run/nmbd.pid
++PIDFile=/run/samba/nmbd.pid
+ EnvironmentFile=-/etc/sysconfig/samba
+ ExecStart=/usr/sbin/nmbd $NMBDOPTIONS
+ ExecReload=/usr/bin/kill -HUP $MAINPID
+--- samba-4.0.5/packaging/systemd/samba.service~       2012-10-16 09:33:05.000000000 +0200
++++ samba-4.0.5/packaging/systemd/samba.service        2013-04-11 13:13:10.947024140 +0200
+@@ -4,7 +4,7 @@
+ 
+ [Service]
+ Type=forking
+-PIDFile=/run/samba.pid
++PIDFile=/run/samba/samba.pid
+ LimitNOFILE=16384
+ EnvironmentFile=-/etc/sysconfig/samba
+ ExecStart=/usr/sbin/samba $SAMBAOPTIONS
+--- samba-4.0.5/packaging/systemd/smb.service~ 2012-10-16 09:33:05.000000000 +0200
++++ samba-4.0.5/packaging/systemd/smb.service  2013-04-11 13:13:04.546972940 +0200
+@@ -4,7 +4,7 @@
+ 
+ [Service]
+ Type=forking
+-PIDFile=/run/smbd.pid
++PIDFile=/run/samba/smbd.pid
+ LimitNOFILE=16384
+ EnvironmentFile=-/etc/sysconfig/samba
+ ExecStart=/usr/sbin/smbd $SMBDOPTIONS
+--- samba-4.0.5/packaging/systemd/winbind.service~     2012-10-16 09:33:05.000000000 +0200
++++ samba-4.0.5/packaging/systemd/winbind.service      2013-04-11 13:12:56.876911589 +0200
+@@ -4,7 +4,7 @@
+ 
+ [Service]
+ Type=forking
+-PIDFile=/run/winbindd.pid
++PIDFile=/run/samba/winbindd.pid
+ EnvironmentFile=-/etc/sysconfig/samba
+ ExecStart=/usr/sbin/winbindd "$WINBINDOPTIONS"
+ ExecReload=/usr/bin/kill -HUP $MAINPID