summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-06-02 17:58:35 +0200
committerThomas Haller <thaller@redhat.com>2016-06-02 20:59:10 +0200
commitc8199b7de0d9e24e9c64cab89e2a7468e5411081 (patch)
tree6caa84c0bcb26060dfa45a5035eb4a03520635ff
parentaa04e04c83a953be8fa8cb0787cf20e57b1d968d (diff)
downloadNetworkManager-c8199b7de0d9e24e9c64cab89e2a7468e5411081.tar.gz
systemd: use RemainAfterExit=yes for NetworkManager-wait-online.service
RemainAfterExit=yes is typically used for Type=oneshot services. systemd-networkd-wait-online.service uses it, so we should as well. See https://www.freedesktop.org/software/systemd/man/systemd.service.html#RemainAfterExit= https://www.freedesktop.org/software/systemd/man/systemd.service.html#Type= https://bugzilla.gnome.org/show_bug.cgi?id=767170
-rw-r--r--data/NetworkManager-wait-online-systemd-pre200.service.in1
-rw-r--r--data/NetworkManager-wait-online.service.in1
2 files changed, 2 insertions, 0 deletions
diff --git a/data/NetworkManager-wait-online-systemd-pre200.service.in b/data/NetworkManager-wait-online-systemd-pre200.service.in
index d145a79ff7..f3de72a81b 100644
--- a/data/NetworkManager-wait-online-systemd-pre200.service.in
+++ b/data/NetworkManager-wait-online-systemd-pre200.service.in
@@ -8,6 +8,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 8c4fa67865..add98c8505 100644
--- a/data/NetworkManager-wait-online.service.in
+++ b/data/NetworkManager-wait-online.service.in
@@ -7,6 +7,7 @@ Before=network-online.target
[Service]
Type=oneshot
ExecStart=@bindir@/nm-online -s -q --timeout=30
+RemainAfterExit=yes
[Install]
WantedBy=network-online.target