diff options
| author | Andreas Schneider <asn@samba.org> | 2017-11-10 09:32:27 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2017-11-29 09:24:25 +0100 |
| commit | e90e3d7efb555dc430ba47c433c96f4f4835f33f (patch) | |
| tree | 62fb52ae368237c534fa0c75d363fc9579bd192e /packaging/systemd | |
| parent | fe6da6730b5a7bc43fe8a060f00571cad783ee15 (diff) | |
| download | samba-e90e3d7efb555dc430ba47c433c96f4f4835f33f.tar.gz | |
systemd: Start processes in forground and without a process group
We should not double fork in notify mode or systemd think something
during startup will be wrong and send SIGTERM to the process. So
sometimes the daemon will not start up correctly.
systemd will also handle the process group.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13129
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 8b6f58194da7e849cdb9d20712dff49b17a93a77)
Diffstat (limited to 'packaging/systemd')
| -rw-r--r-- | packaging/systemd/nmb.service | 2 | ||||
| -rw-r--r-- | packaging/systemd/samba.service | 2 | ||||
| -rw-r--r-- | packaging/systemd/smb.service | 2 | ||||
| -rw-r--r-- | packaging/systemd/winbind.service | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service index 992c0cd9d2b..71c93d6088b 100644 --- a/packaging/systemd/nmb.service +++ b/packaging/systemd/nmb.service @@ -7,7 +7,7 @@ Type=notify NotifyAccess=all PIDFile=/run/nmbd.pid EnvironmentFile=-/etc/sysconfig/samba -ExecStart=/usr/sbin/nmbd $NMBDOPTIONS +ExecStart=/usr/sbin/nmbd --foreground --no-process-group $NMBDOPTIONS ExecReload=/usr/bin/kill -HUP $MAINPID LimitCORE=infinity diff --git a/packaging/systemd/samba.service b/packaging/systemd/samba.service index 824f89c2030..1b64c3b779d 100644 --- a/packaging/systemd/samba.service +++ b/packaging/systemd/samba.service @@ -8,7 +8,7 @@ NotifyAccess=all PIDFile=/run/samba.pid LimitNOFILE=16384 EnvironmentFile=-/etc/sysconfig/samba -ExecStart=/usr/sbin/samba $SAMBAOPTIONS +ExecStart=/usr/sbin/samba --foreground --no-process-group $SAMBAOPTIONS ExecReload=/usr/bin/kill -HUP $MAINPID [Install] diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service index 6053a5caaa5..adf6684c7d9 100644 --- a/packaging/systemd/smb.service +++ b/packaging/systemd/smb.service @@ -8,7 +8,7 @@ NotifyAccess=all PIDFile=/run/smbd.pid LimitNOFILE=16384 EnvironmentFile=-/etc/sysconfig/samba -ExecStart=/usr/sbin/smbd $SMBDOPTIONS +ExecStart=/usr/sbin/smbd --foreground --no-process-group $SMBDOPTIONS ExecReload=/usr/bin/kill -HUP $MAINPID LimitCORE=infinity diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service index c511488166e..46b3797251d 100644 --- a/packaging/systemd/winbind.service +++ b/packaging/systemd/winbind.service @@ -7,7 +7,7 @@ Type=notify NotifyAccess=all PIDFile=/run/winbindd.pid EnvironmentFile=-/etc/sysconfig/samba -ExecStart=/usr/sbin/winbindd "$WINBINDOPTIONS" +ExecStart=/usr/sbin/winbindd --foreground --no-process-group "$WINBINDOPTIONS" ExecReload=/usr/bin/kill -HUP $MAINPID LimitCORE=infinity |