diff options
| author | Michael Biebl <biebl@debian.org> | 2016-08-03 22:59:23 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-08-03 22:59:23 +0200 |
| commit | d6201f5d8daada3d64a0a3e0038e14eebec683ce (patch) | |
| tree | 035500728cc23e7ee5368c3fd605270265a077f7 /data | |
| parent | 73e152af6e3fb4f5848bfb8394484026ff119003 (diff) | |
Imported Upstream version 1.2.4 upstream/1.2.4
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.in | 1 | ||||
| -rw-r--r-- | data/NetworkManager-wait-online-systemd-pre200.service.in | 2 | ||||
| -rw-r--r-- | data/NetworkManager-wait-online.service.in | 2 | ||||
| -rw-r--r-- | data/NetworkManager.service.in | 2 |
4 files changed, 7 insertions, 0 deletions
diff --git a/data/Makefile.in b/data/Makefile.in index c50d11f5..9bdf8fbb 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -297,6 +297,7 @@ NEWT_LIBS = @NEWT_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@ +NM_CONFIG_DEFAULT_DNS_RC_MANAGER = @NM_CONFIG_DEFAULT_DNS_RC_MANAGER@ NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT = @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@ NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT = @NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@ NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ diff --git a/data/NetworkManager-wait-online-systemd-pre200.service.in b/data/NetworkManager-wait-online-systemd-pre200.service.in index d145a79f..55e4508c 100644 --- a/data/NetworkManager-wait-online-systemd-pre200.service.in +++ b/data/NetworkManager-wait-online-systemd-pre200.service.in @@ -1,5 +1,6 @@ [Unit] Description=Network Manager Wait Online +Documentation=man:nm-online(1) Requisite=NetworkManager.service After=NetworkManager.service Wants=network.target @@ -8,6 +9,7 @@ Before=network.target [Service] Type=oneshot ExecStart=@bindir@/nm-online -s -q --timeout=30 +RemainAfterExit=yes [Install] WantedBy=network.target diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in index 8c4fa678..1753d203 100644 --- a/data/NetworkManager-wait-online.service.in +++ b/data/NetworkManager-wait-online.service.in @@ -1,5 +1,6 @@ [Unit] Description=Network Manager Wait Online +Documentation=man:nm-online(1) Requisite=NetworkManager.service After=NetworkManager.service Before=network-online.target @@ -7,6 +8,7 @@ Before=network-online.target [Service] Type=oneshot ExecStart=@bindir@/nm-online -s -q --timeout=30 +RemainAfterExit=yes [Install] WantedBy=network-online.target diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in index 7946ac18..95128a68 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -1,5 +1,6 @@ [Unit] Description=Network Manager +Documentation=man:NetworkManager(8) Wants=network.target After=network-pre.target dbus.service Before=network.target @DISTRO_NETWORK_SERVICE@ @@ -7,6 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@ [Service] Type=dbus BusName=org.freedesktop.NetworkManager +#ExecReload=/usr/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.Reload uint32:0 ExecReload=/bin/kill -HUP $MAINPID ExecStart=@sbindir@/NetworkManager --no-daemon Restart=on-failure |