diff options
author | Thomas Haller <thaller@redhat.com> | 2020-11-16 17:46:57 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2020-11-16 17:46:57 +0100 |
commit | 71c3291296ed9441899aac32d4e959a078484904 (patch) | |
tree | 29e3b77b1d24069e676234b97de6345578fecca5 | |
parent | 090c360ca40e9cc3435e493db186df6b3584b6bc (diff) | |
parent | 30824b8888bf389268e7d31c592f675055ccdbe2 (diff) | |
download | NetworkManager-71c3291296ed9441899aac32d4e959a078484904.tar.gz |
data: merge branch 'mikhailnov:timeout-60'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/675
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | data/NetworkManager-wait-online.service.in | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -15,6 +15,7 @@ USE AT YOUR OWN RISK. NOT RECOMMENDED FOR PRODUCTION USE! * libnm: nm_setting_bond_add_option() no longer validates the option that is set. Instead, use nm_connection_verify() to validate the profile. +* Increase timeout of NetworkManager-wait-online.service to 60 seconds. ============================================= NetworkManager-1.28 diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in index 26a8f25362..fda23916d5 100644 --- a/data/NetworkManager-wait-online.service.in +++ b/data/NetworkManager-wait-online.service.in @@ -26,7 +26,7 @@ RemainAfterExit=yes # gets delayed too long, then the solution is usually not to decrease # the timeout, but to fix your setup so that the connected state # gets reached earlier. -Environment=NM_ONLINE_TIMEOUT=30 +Environment=NM_ONLINE_TIMEOUT=60 [Install] WantedBy=network-online.target |