Gentoo Archives: gentoo-commits

From: Sergey Popov <pinkbyte@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/files/
Date: Wed, 21 Mar 2018 12:52:50
Message-Id: 1521636713.dd6e7028de6652829f79b7c2bb0e16269474bda4.pinkbyte@gentoo
1 commit: dd6e7028de6652829f79b7c2bb0e16269474bda4
2 Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 21 12:51:01 2018 +0000
4 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 21 12:51:53 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd6e7028
7
8 net-dialup/accel-ppp: change default shutdown mode
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 net-dialup/accel-ppp/files/accel-ppp.confd | 7 +++++++
13 net-dialup/accel-ppp/files/accel-ppp.initd | 4 ++--
14 2 files changed, 9 insertions(+), 2 deletions(-)
15
16 diff --git a/net-dialup/accel-ppp/files/accel-ppp.confd b/net-dialup/accel-ppp/files/accel-ppp.confd
17 index 41073c6529c..7a4d2d3712b 100644
18 --- a/net-dialup/accel-ppp/files/accel-ppp.confd
19 +++ b/net-dialup/accel-ppp/files/accel-ppp.confd
20 @@ -8,3 +8,10 @@ RADATTR_DIR="/run/radattr"
21
22 # Daemon options
23 ACCEL_PPPD_OPTS="-d -c /etc/accel-ppp.conf"
24 +
25 +# Set type of shutdown for accel-ppp daemon
26 +# Default is 'hard' shutdown due to freezes
27 +# when using upstream default('soft') with
28 +# hundreds of sessions.
29 +# Uncomment and set different mode if you wish
30 +#SHUTDOWN_MODE="hard"
31
32 diff --git a/net-dialup/accel-ppp/files/accel-ppp.initd b/net-dialup/accel-ppp/files/accel-ppp.initd
33 index abbc4286228..357ae424edc 100644
34 --- a/net-dialup/accel-ppp/files/accel-ppp.initd
35 +++ b/net-dialup/accel-ppp/files/accel-ppp.initd
36 @@ -1,5 +1,5 @@
37 #!/sbin/openrc-run
38 -# Copyright 1999-2016 Gentoo Foundation
39 +# Copyright 1999-2018 Gentoo Foundation
40 # Distributed under the terms of the GNU General Public License, v2 or later
41
42 extra_started_commands="reload"
43 @@ -23,7 +23,7 @@ start() {
44
45 stop() {
46 ebegin "Stopping accel-pppd"
47 - accel-cmd shutdown
48 + accel-cmd shutdown ${SHUTDOWN_MODE:-hard}
49 [ $? -ne 0 ] && kill -9 $(pidof accel-pppd)
50 PID="$(cat ${ACCEL_PPPD_PID})"
51 while [ -n "${PID}" -a -d "/proc/${PID}" ]; do