diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2016-11-30 19:21:18 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-01-29 19:32:33 -0500 |
commit | aabd2f014252c5f11541e691baf1eeeb366033b0 (patch) | |
tree | 5911928f8e52b09031859c7c036cd04585cd9b8f /meta-networking | |
parent | 3c43856b9fa2c1bf1e0b722cd89cdd6abbb14b4a (diff) | |
download | meta-openembedded-aabd2f014252c5f11541e691baf1eeeb366033b0.tar.gz |
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-connectivity/samba/samba-4.4.5/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch | 31 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba-4.4.5/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch b/meta-networking/recipes-connectivity/samba/samba-4.4.5/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch new file mode 100644 index 000000000..0ab3436fc --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba-4.4.5/0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Upstream-Status: Submitted [https://github.com/samba-team/samba/pull/70] | ||
2 | |||
3 | Signed-off-by: Andreas Oberritter <obi@opendreambox.org> | ||
4 | |||
5 | From 50eac4fd30944e5e1d83060757633fe0ed572723 Mon Sep 17 00:00:00 2001 | ||
6 | From: Andreas Oberritter <obi@opendreambox.org> | ||
7 | Date: Wed, 30 Nov 2016 16:25:06 +0100 | ||
8 | Subject: [PATCH] packaging: Avoid timeout for nmbd if started offline with | ||
9 | systemd | ||
10 | |||
11 | If no network connection appears within DefaultTimeoutStartSec | ||
12 | (~ 90s) after startup, nmbd fails to notify systemd and will | ||
13 | therefore get killed. | ||
14 | |||
15 | Signed-off-by: Andreas Oberritter <obi@opendreambox.org> | ||
16 | --- | ||
17 | packaging/systemd/nmb.service | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service | ||
21 | index 992c0cd..555c9ab 100644 | ||
22 | --- a/packaging/systemd/nmb.service | ||
23 | +++ b/packaging/systemd/nmb.service | ||
24 | @@ -10,6 +10,7 @@ EnvironmentFile=-/etc/sysconfig/samba | ||
25 | ExecStart=/usr/sbin/nmbd $NMBDOPTIONS | ||
26 | ExecReload=/usr/bin/kill -HUP $MAINPID | ||
27 | LimitCORE=infinity | ||
28 | +TimeoutStartSec=0 | ||
29 | |||
30 | [Install] | ||
31 | WantedBy=multi-user.target | ||
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb index 2034e1fc9..d807351af 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb | |||
@@ -17,6 +17,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ | |||
17 | file://16-do-not-check-xsltproc-manpages.patch \ | 17 | file://16-do-not-check-xsltproc-manpages.patch \ |
18 | file://20-do-not-import-target-module-while-cross-compile.patch \ | 18 | file://20-do-not-import-target-module-while-cross-compile.patch \ |
19 | file://21-add-config-option-without-valgrind.patch \ | 19 | file://21-add-config-option-without-valgrind.patch \ |
20 | file://0001-packaging-Avoid-timeout-for-nmbd-if-started-offline-.patch \ | ||
20 | file://0006-avoid-using-colon-in-the-checking-msg.patch \ | 21 | file://0006-avoid-using-colon-in-the-checking-msg.patch \ |
21 | file://volatiles.03_samba \ | 22 | file://volatiles.03_samba \ |
22 | " | 23 | " |