summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2013-12-16 14:42:40 -0500
committerDan Winship <danw@gnome.org>2013-12-17 09:45:18 -0500
commit7481c64ad5068130d92066b1155e6933f8c39655 (patch)
tree42a1c359ad38f8d37447bc952e02a5881f7a46d6 /configure.ac
parentabaa17edb9a1d80caaca635734db2b90a294ccd2 (diff)
downloadNetworkManager-7481c64ad5068130d92066b1155e6933f8c39655.tar.gz
systemd: add "Before=network.service" on Fedora/RHEL (rh #1034983)
On Fedora/RHEL, NetworkManager.service needs to be started before network.service, or else network.service may try to bring up NM's devices itself.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 6 insertions, 0 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