From 70e18d99b8e3e77bb37e218d7ac582130156f8ef Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 25 Jan 2024 09:46:18 +0100 Subject: New upstream version 1.45.90 --- data/NetworkManager-dispatcher.service.in | 1 + data/NetworkManager-wait-online-systemd-pre200.service.in | 15 --------------- data/meson.build | 7 +------ 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 data/NetworkManager-wait-online-systemd-pre200.service.in (limited to 'data') 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, -- cgit 1.3.0-6-gf8a5