diff --git a/Makefile.am b/Makefile.am index fbad8e2b60..b28a61b35e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5554,13 +5554,8 @@ systemdsystemunit_DATA += \ data/NetworkManager.service: $(srcdir)/data/NetworkManager.service.in $(AM_V_GEN) $(data_edit) $< >$@ -if HAVE_SYSTEMD_200 data/NetworkManager-wait-online.service: $(srcdir)/data/NetworkManager-wait-online.service.in $(AM_V_GEN) $(data_edit) $< >$@ -else -data/NetworkManager-wait-online.service: $(srcdir)/data/NetworkManager-wait-online-systemd-pre200.service.in - $(AM_V_GEN) $(data_edit) $< >$@ -endif data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in $(AM_V_GEN) $(data_edit) $< >$@ diff --git a/configure.ac b/configure.ac index 7961a316bd..311e74a0da 100644 --- a/configure.ac +++ b/configure.ac @@ -334,9 +334,6 @@ if test "$with_systemdsystemunitdir" != no; then AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) fi -PKG_CHECK_MODULES(SYSTEMD_200, [systemd >= 200], [have_systemd_200=yes], [have_systemd_200=no]) -AM_CONDITIONAL(HAVE_SYSTEMD_200, test "${have_systemd_200}" = "yes") - # Hostname persist mode AC_ARG_WITH(hostname-persist, AS_HELP_STRING([--with-hostname-persist=default|suse|gentoo|slackware], 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 55e4508c8e..0000000000 --- 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 d617025a25..79c88ed7f9 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, diff --git a/meson.build b/meson.build index f7a03850b6..ce04a79697 100644 --- a/meson.build +++ b/meson.build @@ -273,7 +273,6 @@ libsystemd_login_dep = dependency('libsystemd-login', version: '>= 183', require config_h.set10('HAVE_LIBSYSTEMD', libsystemd_dep.found()) systemd_dep = dependency('systemd', required: false) -have_systemd_200 = systemd_dep.found() and systemd_dep.version().version_compare('>= 200') gio_unix_dep = dependency('gio-unix-2.0', version: '>= 2.40')