diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-22 16:55:11 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-22 17:04:04 -0500 |
| commit | 9bb70a1702d95481541916bd29903a8d75251831 (patch) | |
| tree | 5af847e78e5836ffd841714b541636729675d6a6 /src/core/ppp | |
| parent | 2ddef01c8fe66feabcd5a33b904ff3a5deb89652 (diff) | |
| parent | 6dff5938b0e45d461d0351da304a68916f2e9a2b (diff) | |
Merge tag 'debian/1.35.92-1' into ubuntu/master
network-manager Debian release 1.35.92-1
Diffstat (limited to 'src/core/ppp')
| -rw-r--r-- | src/core/ppp/nm-ppp-manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ppp/nm-ppp-manager.c b/src/core/ppp/nm-ppp-manager.c index f1f10305..dd6b1bc7 100644 --- a/src/core/ppp/nm-ppp-manager.c +++ b/src/core/ppp/nm-ppp-manager.c @@ -1246,7 +1246,7 @@ _ppp_manager_stop(NMPPPManager *self, SIGTERM, LOGD_PPP, "pppd", - NM_SHUTDOWN_TIMEOUT_MS, + 5000, _stop_child_cb, handle); |