mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 02:31:27 +00:00
samba: Avoid timeout for nmbd if started offline with systemd
If no network connection appears within DefaultTimeoutStartSec (~ 90s) after startup, nmbd fails to notify systemd and will therefore get killed. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
committed by
Joe MacDonald
parent
1404d793d9
commit
bb2cbb965a
+31
@@ -0,0 +1,31 @@
|
|||||||
|
Upstream-Status: Submitted [https://github.com/samba-team/samba/pull/70]
|
||||||
|
|
||||||
|
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
|
||||||
|
|
||||||
|
From 50eac4fd30944e5e1d83060757633fe0ed572723 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andreas Oberritter <obi@opendreambox.org>
|
||||||
|
Date: Wed, 30 Nov 2016 16:25:06 +0100
|
||||||
|
Subject: [PATCH] packaging: Avoid timeout for nmbd if started offline with
|
||||||
|
systemd
|
||||||
|
|
||||||
|
If no network connection appears within DefaultTimeoutStartSec
|
||||||
|
(~ 90s) after startup, nmbd fails to notify systemd and will
|
||||||
|
therefore get killed.
|
||||||
|
|
||||||
|
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
|
||||||
|
---
|
||||||
|
packaging/systemd/nmb.service | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service
|
||||||
|
index 992c0cd..555c9ab 100644
|
||||||
|
--- a/packaging/systemd/nmb.service
|
||||||
|
+++ b/packaging/systemd/nmb.service
|
||||||
|
@@ -10,6 +10,7 @@ EnvironmentFile=-/etc/sysconfig/samba
|
||||||
|
ExecStart=/usr/sbin/nmbd $NMBDOPTIONS
|
||||||
|
ExecReload=/usr/bin/kill -HUP $MAINPID
|
||||||
|
LimitCORE=infinity
|
||||||
|
+TimeoutStartSec=0
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
@@ -17,6 +17,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \
|
|||||||
file://16-do-not-check-xsltproc-manpages.patch \
|
file://16-do-not-check-xsltproc-manpages.patch \
|
||||||
file://20-do-not-import-target-module-while-cross-compile.patch \
|
file://20-do-not-import-target-module-while-cross-compile.patch \
|
||||||
file://21-add-config-option-without-valgrind.patch \
|
file://21-add-config-option-without-valgrind.patch \
|
||||||
|
file://0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch \
|
||||||
file://0006-avoid-using-colon-in-the-checking-msg.patch \
|
file://0006-avoid-using-colon-in-the-checking-msg.patch \
|
||||||
file://volatiles.03_samba \
|
file://volatiles.03_samba \
|
||||||
"
|
"
|
||||||
|
|||||||
Reference in New Issue
Block a user