summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac6
-rw-r--r--data/Makefile.am3
-rw-r--r--data/NetworkManager.service.in2
3 files changed, 9 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index f19b9adea3..b525de633b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,6 +110,12 @@ AM_CONDITIONAL(CONFIG_PLUGIN_IFCFG_RH, test "$enable_ifcfg_rh" = "yes")
AM_CONDITIONAL(CONFIG_PLUGIN_IFCFG_SUSE, test "$enable_ifcfg_suse" = "yes")
AM_CONDITIONAL(CONFIG_PLUGIN_IFUPDOWN, test "$enable_ifupdown" = "yes")
AM_CONDITIONAL(CONFIG_PLUGIN_IFNET, test "$enable_ifnet" = "yes")
+
+if test "$enable_ifcfg_rh" = "yes"; then
+ DISTRO_NETWORK_SERVICE=network.service
+fi
+AC_SUBST(DISTRO_NETWORK_SERVICE)
+
# Code coverage
GNOME_CODE_COVERAGE
diff --git a/data/Makefile.am b/data/Makefile.am
index df93f27742..29011efb11 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -38,7 +38,8 @@ edit = sed \
-e 's|@sbindir[@]|$(sbindir)|g' \
-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
-e 's|@localstatedir[@]|$(localstatedir)|g' \
- -e 's|@libexecdir[@]|$(libexecdir)|g'
+ -e 's|@libexecdir[@]|$(libexecdir)|g' \
+ -e 's|@DISTRO_NETWORK_SERVICE[@]|$(DISTRO_NETWORK_SERVICE)|g'
EXTRA_DIST = \
NetworkManager.service.in \
diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
index 8ceefad48b..84a9c959c2 100644
--- a/data/NetworkManager.service.in
+++ b/data/NetworkManager.service.in
@@ -1,7 +1,7 @@
[Unit]
Description=Network Manager
Wants=network.target
-Before=network.target
+Before=network.target @DISTRO_NETWORK_SERVICE@
[Service]
Type=dbus