diff options
| author | Michael Biebl <biebl@debian.org> | 2024-01-25 09:46:18 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-01-25 09:46:18 +0100 |
| commit | 70e18d99b8e3e77bb37e218d7ac582130156f8ef (patch) | |
| tree | d40c587e6d3f0e094ff558e415f1bb9803643214 /data | |
| parent | d4d8b2b91f7ba000d97a8b2aab48c85000c11314 (diff) | |
New upstream version 1.45.90 upstream/1.45.90
Diffstat (limited to 'data')
| -rw-r--r-- | data/NetworkManager-dispatcher.service.in | 1 | ||||
| -rw-r--r-- | data/NetworkManager-wait-online-systemd-pre200.service.in | 15 | ||||
| -rw-r--r-- | data/meson.build | 7 |
3 files changed, 2 insertions, 21 deletions
diff --git a/data/NetworkManager-dispatcher.service.in b/data/NetworkManager-dispatcher.service.in index 1a45f353..7861807d 100644 --- a/data/NetworkManager-dispatcher.service.in +++ b/data/NetworkManager-dispatcher.service.in @@ -1,5 +1,6 @@ [Unit] Description=Network Manager Script Dispatcher Service +Documentation=man:NetworkManager-dispatcher.service(8) [Service] Type=dbus diff --git a/data/NetworkManager-wait-online-systemd-pre200.service.in b/data/NetworkManager-wait-online-systemd-pre200.service.in deleted file mode 100644 index 55e4508c..00000000 --- a/data/NetworkManager-wait-online-systemd-pre200.service.in +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Network Manager Wait Online -Documentation=man:nm-online(1) -Requisite=NetworkManager.service -After=NetworkManager.service -Wants=network.target -Before=network.target - -[Service] -Type=oneshot -ExecStart=@bindir@/nm-online -s -q --timeout=30 -RemainAfterExit=yes - -[Install] -WantedBy=network.target diff --git a/data/meson.build b/data/meson.build index d617025a..79c88ed7 100644 --- a/data/meson.build +++ b/data/meson.build @@ -12,14 +12,9 @@ if install_systemdunitdir 'NetworkManager-dispatcher.service.in', 'NetworkManager.service.in', 'nm-priv-helper.service.in', + 'NetworkManager-wait-online.service.in', ] - if have_systemd_200 - services += ['NetworkManager-wait-online.service.in'] - else - services += ['NetworkManager-wait-online-systemd-pre200.service.in'] - endif - foreach service: services configure_file( input: service, |