diff options
| author | Michael Biebl <biebl@debian.org> | 2023-08-09 21:56:59 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2023-08-09 21:56:59 +0200 |
| commit | b1206f287e4fae1f9a7e29ec0dc11b54d726a7f8 (patch) | |
| tree | cc1d62cd21f10b2375c76484b5e2187f1e75f010 /data | |
| parent | a6d4d07b23485507f30ddb1ce99f5c82428714c8 (diff) | |
| parent | 05e4a733f2141995181a551854d5df929f084adf (diff) | |
Update upstream source from tag 'upstream/1.44.0'
Update to upstream version '1.44.0' with Debian dir e69e19b54914190e7696747b3e0508f95977f387
Diffstat (limited to 'data')
| -rw-r--r-- | data/NetworkManager-wait-online.service.in | 2 | ||||
| -rw-r--r-- | data/NetworkManager.service.in | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in index fda23916..e3ed53cb 100644 --- a/data/NetworkManager-wait-online.service.in +++ b/data/NetworkManager-wait-online.service.in @@ -1,6 +1,6 @@ [Unit] Description=Network Manager Wait Online -Documentation=man:nm-online(1) +Documentation=man:NetworkManager-wait-online.service(8) Requires=NetworkManager.service After=NetworkManager.service Before=network-online.target diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in index e23b3a52..f09ae86c 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -4,6 +4,7 @@ Documentation=man:NetworkManager(8) Wants=network.target After=network-pre.target dbus.service Before=network.target @DISTRO_NETWORK_SERVICE@ +BindsTo=dbus.service [Service] Type=dbus @@ -15,6 +16,9 @@ Restart=on-failure # NM doesn't want systemd to kill its children for it KillMode=process +# With a huge number of interfaces, starting can take a long time. +TimeoutStartSec=600 + # CAP_DAC_OVERRIDE: required to open /run/openvswitch/db.sock socket. CapabilityBoundingSet=CAP_NET_ADMIN CAP_DAC_OVERRIDE CAP_NET_RAW CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_MODULE CAP_AUDIT_WRITE CAP_KILL CAP_SYS_CHROOT |