File systemd-network-config.patch of Package NetworkManager

Overview Repositories Revisions Requests Users Attributes Meta

File systemd-network-config.patch of Package NetworkManager (Revision 610e397dd064f2a3af102885e5473af3)

Currently displaying revision 610e397dd064f2a3af102885e5473af3 , Show latest

Index: NetworkManager-0.9.3.990/data/NetworkManager.service.in
===================================================================
--- NetworkManager-0.9.3.990.orig/data/NetworkManager.service.in
+++ NetworkManager-0.9.3.990/data/NetworkManager.service.in
@@ -1,13 +1,14 @@
 [Unit]
 Description=Network Manager
 After=syslog.target
-Wants=network.target
-Before=network.target
+Wants=remote-fs.target network.target
 
 [Service]
 Type=dbus
 BusName=org.freedesktop.NetworkManager
 ExecStart=@sbindir@/NetworkManager --no-daemon
+EnvironmentFile=/etc/sysconfig/network/config
+ExecStartPre=/usr/bin/test "x${NETWORKMANAGER}" = xyes
 # Suppress stderr to eliminate duplicated messages in syslog. NM calls openlog()
 # with LOG_PERROR when run in foreground. But systemd redirects stderr to
 # syslog by default, which results in logging each message twice.
@@ -15,4 +16,4 @@ StandardError=null
 
 [Install]
 WantedBy=multi-user.target
-Alias=dbus-org.freedesktop.NetworkManager.service
+Also=NetworkManager-wait-online.service
Index: NetworkManager-0.9.3.990/data/NetworkManager-wait-online.service.in
===================================================================
--- NetworkManager-0.9.3.990.orig/data/NetworkManager-wait-online.service.in
+++ NetworkManager-0.9.3.990/data/NetworkManager-wait-online.service.in
@@ -7,7 +7,9 @@ Before=network.target
 
 [Service]
 Type=oneshot
-ExecStart=@bindir@/nm-online -q --timeout=30
+Environment=NM_ONLINE_TIMEOUT=0
+EnvironmentFile=-/etc/sysconfig/network/config
+ExecStart=/bin/bash -c "if [ ${NM_ONLINE_TIMEOUT} -gt 0 ]; then @bindir@/nm-online -q --timeout=${NM_ONLINE_TIMEOUT} ; else /bin/true ; fi"
 
 [Install]
 WantedBy=network.target

Places

File systemd-network-config.patch of Package NetworkManager (Revision 610e397dd064f2a3af102885e5473af3)

Places