Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/files/
Date: Tue, 30 Jul 2019 01:50:00
Message-Id: 1564451381.39a053a99e04391563810fe953112d2249317681.mattst88@gentoo
1 commit: 39a053a99e04391563810fe953112d2249317681
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 30 01:38:30 2019 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 30 01:49:41 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a053a9
7
8 x11-base/xorg-server: Suppress meaningless errors during shutdown
9
10 Thanks to crocket for the patch.
11
12 Closes: https://bugs.gentoo.org/689936
13 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
14
15 x11-base/xorg-server/files/xdm.initd-11 | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18 diff --git a/x11-base/xorg-server/files/xdm.initd-11 b/x11-base/xorg-server/files/xdm.initd-11
19 index c9ec36746d0..7b2f992325f 100644
20 --- a/x11-base/xorg-server/files/xdm.initd-11
21 +++ b/x11-base/xorg-server/files/xdm.initd-11
22 @@ -207,7 +207,7 @@ stop() {
23
24 ebegin "Stopping ${myservice}"
25
26 - if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then
27 + if start-stop-daemon --quiet --test --stop --exec "${myexe}" 2>/dev/null; then
28 start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \
29 ${mypidfile:+--pidfile} ${mypidfile} \
30 ${myname:+--name} ${myname}