diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2021-02-25 11:35:01 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2021-02-25 11:49:48 +0100 |
| commit | 77dea84aa6e816f66dc622cec8ae2668eba3c068 (patch) | |
| tree | 755536a0ed1fb36c2899e9bff9e092c4008a25c4 /data | |
| parent | 47f08826b44eed651b44dc8bacb5b46bc4c52067 (diff) | |
| parent | fd80297a396cc4dd7da4da20208fb360aa369aa7 (diff) | |
Merge branch 'debian/master' into ubuntu/master
Diffstat (limited to 'data')
| -rw-r--r-- | data/NetworkManager-wait-online.service.in | 2 | ||||
| -rw-r--r-- | data/meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in index 26a8f253..fda23916 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 diff --git a/data/meson.build b/data/meson.build index b713a03c..64a1372b 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later configure_file( input: 'server.conf.in', |