diff options
| author | Dan Winship <danw@gnome.org> | 2013-12-16 14:42:40 -0500 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2013-12-17 09:45:18 -0500 |
| commit | 7481c64ad5068130d92066b1155e6933f8c39655 (patch) | |
| tree | 42a1c359ad38f8d37447bc952e02a5881f7a46d6 /data | |
| parent | abaa17edb9a1d80caaca635734db2b90a294ccd2 (diff) | |
| download | NetworkManager-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 'data')
| -rw-r--r-- | data/Makefile.am | 3 | ||||
| -rw-r--r-- | data/NetworkManager.service.in | 2 |
2 files changed, 3 insertions, 2 deletions
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 |