Attachment 12622 Details for Bug 12402 – systemd improvements

[patch] systemd improvements

systemd-improvements.patch (text/plain), 7.30 KB, created by Mathieu Parent on 2016-11-01 13:16:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Parent

Created: 2016-11-01 13:16:11 UTC

Size: 7.30 KB

patch

obsolete

>From 842d0bae40f61469e14047ab64f1f52bd9012450 Mon Sep 17 00:00:00 2001
>From: Mathieu Parent <math.parent@gmail.com>
>Date: Thu, 12 May 2016 22:04:24 +0200
>Subject: [PATCH 1/4] systemd: syslog.target is obsolete
>
>After=syslog.target is unnecessary by now because syslog is socket-activated and will therefore be started when needed.
>
>Ref: https://lintian.debian.org/tags/systemd-service-file-refers-to-obsolete-target.html
>
>Signed-off-by: Mathieu Parent <math.parent@gmail.com>
>---
> packaging/systemd/nmb.service     | 2 +-
> packaging/systemd/samba.service   | 2 +-
> packaging/systemd/smb.service     | 2 +-
> 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 992c0cd..b8aba50 100644
>--- a/packaging/systemd/nmb.service
>+++ b/packaging/systemd/nmb.service
>@@ -1,6 +1,6 @@
> [Unit]
> Description=Samba NMB Daemon
>-After=syslog.target network.target
>+After=network.target
> 
> [Service]
> Type=notify
>diff --git a/packaging/systemd/samba.service b/packaging/systemd/samba.service
>index 824f89c..83e0daf 100644
>--- a/packaging/systemd/samba.service
>+++ b/packaging/systemd/samba.service
>@@ -1,6 +1,6 @@
> [Unit]
> Description=Samba AD Daemon
>-After=syslog.target network.target
>+After=network.target
> 
> [Service]
> Type=notify
>diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service
>index 6053a5c..7509407 100644
>--- a/packaging/systemd/smb.service
>+++ b/packaging/systemd/smb.service
>@@ -1,6 +1,6 @@
> [Unit]
> Description=Samba SMB Daemon
>-After=syslog.target network.target nmb.service winbind.service
>+After=network.target nmb.service winbind.service
> 
> [Service]
> Type=notify
>diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service
>index c511488..b412533 100644
>--- a/packaging/systemd/winbind.service
>+++ b/packaging/systemd/winbind.service
>@@ -1,6 +1,6 @@
> [Unit]
> Description=Samba Winbind Daemon
>-After=syslog.target network.target nmb.service
>+After=network.target nmb.service
> 
> [Service]
> Type=notify
>-- 
>2.9.3
>
>
>From 686836403bc709c04a9dbdd7112108651966b3a1 Mon Sep 17 00:00:00 2001
>From: Mathieu Parent <math.parent@gmail.com>
>Date: Thu, 12 May 2016 22:16:24 +0200
>Subject: [PATCH 2/4] Add documentation to systemd Unit files
>
>Signed-off-by: Mathieu Parent <math.parent@gmail.com>
>---
> ctdb/config/ctdb.service          | 1 +
> packaging/systemd/nmb.service     | 1 +
> packaging/systemd/samba.service   | 1 +
> packaging/systemd/smb.service     | 1 +
> packaging/systemd/winbind.service | 1 +
> 5 files changed, 5 insertions(+)
>
>diff --git a/ctdb/config/ctdb.service b/ctdb/config/ctdb.service
>index 63cdfa9..189f2f4 100644
>--- a/ctdb/config/ctdb.service
>+++ b/ctdb/config/ctdb.service
>@@ -1,5 +1,6 @@
> [Unit]
> Description=CTDB
>+Documentation=man:ctdbd(1) man:ctdb(7)
> After=network-online.target time-sync.target
> 
> [Service]
>diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service
>index b8aba50..2c152ba 100644
>--- a/packaging/systemd/nmb.service
>+++ b/packaging/systemd/nmb.service
>@@ -1,5 +1,6 @@
> [Unit]
> Description=Samba NMB Daemon
>+Documentation=man:nmbd(8) man:samba(7) man:smb.conf(5)
> After=network.target
> 
> [Service]
>diff --git a/packaging/systemd/samba.service b/packaging/systemd/samba.service
>index 83e0daf..6512bef 100644
>--- a/packaging/systemd/samba.service
>+++ b/packaging/systemd/samba.service
>@@ -1,5 +1,6 @@
> [Unit]
> Description=Samba AD Daemon
>+Documentation=man:samba(8) man:samba(7) man:smb.conf(5)
> After=network.target
> 
> [Service]
>diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service
>index 7509407..491f45e 100644
>--- a/packaging/systemd/smb.service
>+++ b/packaging/systemd/smb.service
>@@ -1,5 +1,6 @@
> [Unit]
> Description=Samba SMB Daemon
>+Documentation=man:smbd(8) man:samba(7) man:smb.conf(5)
> After=network.target nmb.service winbind.service
> 
> [Service]
>diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service
>index b412533..cd28767 100644
>--- a/packaging/systemd/winbind.service
>+++ b/packaging/systemd/winbind.service
>@@ -1,5 +1,6 @@
> [Unit]
> Description=Samba Winbind Daemon
>+Documentation=man:winbindd(8) man:samba(7) man:smb.conf(5)
> After=network.target nmb.service
> 
> [Service]
>-- 
>2.9.3
>
>
>From 442ef8c548914fa232b1ced66354092f1acf1588 Mon Sep 17 00:00:00 2001
>From: Mathieu Parent <math.parent@gmail.com>
>Date: Mon, 27 Jun 2016 21:34:03 +0200
>Subject: [PATCH 3/4] Fix kill path
>
>Debian-bug: https://bugs.debian.org/828730
>
>Signed-off-by: Mathieu Parent <math.parent@gmail.com>
>---
> packaging/systemd/nmb.service     | 2 +-
> packaging/systemd/samba.service   | 2 +-
> packaging/systemd/smb.service     | 2 +-
> 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 2c152ba..c02e65d 100644
>--- a/packaging/systemd/nmb.service
>+++ b/packaging/systemd/nmb.service
>@@ -9,7 +9,7 @@ NotifyAccess=all
> PIDFile=/run/nmbd.pid
> EnvironmentFile=-/etc/sysconfig/samba
> ExecStart=/usr/sbin/nmbd $NMBDOPTIONS
>-ExecReload=/usr/bin/kill -HUP $MAINPID
>+ExecReload=/bin/kill -HUP $MAINPID
> LimitCORE=infinity
> 
> [Install]
>diff --git a/packaging/systemd/samba.service b/packaging/systemd/samba.service
>index 6512bef..11d2e47 100644
>--- a/packaging/systemd/samba.service
>+++ b/packaging/systemd/samba.service
>@@ -10,7 +10,7 @@ PIDFile=/run/samba.pid
> LimitNOFILE=16384
> EnvironmentFile=-/etc/sysconfig/samba
> ExecStart=/usr/sbin/samba $SAMBAOPTIONS
>-ExecReload=/usr/bin/kill -HUP $MAINPID
>+ExecReload=/bin/kill -HUP $MAINPID
> 
> [Install]
> WantedBy=multi-user.target
>diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service
>index 491f45e..cc7831c 100644
>--- a/packaging/systemd/smb.service
>+++ b/packaging/systemd/smb.service
>@@ -10,7 +10,7 @@ PIDFile=/run/smbd.pid
> LimitNOFILE=16384
> EnvironmentFile=-/etc/sysconfig/samba
> ExecStart=/usr/sbin/smbd $SMBDOPTIONS
>-ExecReload=/usr/bin/kill -HUP $MAINPID
>+ExecReload=/bin/kill -HUP $MAINPID
> LimitCORE=infinity
> 
> [Install]
>diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service
>index cd28767..e7f1651 100644
>--- a/packaging/systemd/winbind.service
>+++ b/packaging/systemd/winbind.service
>@@ -9,7 +9,7 @@ NotifyAccess=all
> PIDFile=/run/winbindd.pid
> EnvironmentFile=-/etc/sysconfig/samba
> ExecStart=/usr/sbin/winbindd "$WINBINDOPTIONS"
>-ExecReload=/usr/bin/kill -HUP $MAINPID
>+ExecReload=/bin/kill -HUP $MAINPID
> LimitCORE=infinity
> 
> [Install]
>-- 
>2.9.3
>
>
>From fced20795a9558765ec71aaf2ff5388d2efb3440 Mon Sep 17 00:00:00 2001
>From: Mathieu Parent <math.parent@gmail.com>
>Date: Mon, 31 Oct 2016 20:45:27 +0100
>Subject: [PATCH 4/4] nmbd requires a working network
>
>Bug-Debian: https://bugs.debian.org/698056
>Bug-Debian: https://bugs.debian.org/842056
>Bug-Debian: https://bugs.debian.org/840608
>Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/1635491
>
>Signed-off-by: Mathieu Parent <math.parent@gmail.com>
>---
> packaging/systemd/nmb.service | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service
>index c02e65d..71cf1c2 100644
>--- a/packaging/systemd/nmb.service
>+++ b/packaging/systemd/nmb.service
>@@ -1,7 +1,8 @@
> [Unit]
> Description=Samba NMB Daemon
> Documentation=man:nmbd(8) man:samba(7) man:smb.conf(5)
>-After=network.target
>+After=network-online.target
>+Wants=network-online.target
> 
> [Service]
> Type=notify
>-- 
>2.9.3
>

Actions: View

Attachments on bug 12402: 12613 | 12614 | 12615 | 12616 | 12618 | 12622 | 12623 | 12624