From: Franck Bui <fbui@suse.com>
Date: Fri, 12 Jan 2018 15:20:36 +0000 (+0100)
Subject: Comment the fact that some tools need to termintate their bus connect first
X-Git-Tag: v237~113^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7865%2Fhead;p=thirdparty%2Fsystemd.git

Comment the fact that some tools need to termintate their bus connect first
---

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 18c65c5a34d..f8c43b5079c 100644
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -2113,6 +2113,8 @@ int main(int argc, char *argv[]) {
         r = busctl_main(bus, argc, argv);
 
 finish:
+        /* make sure we terminate the bus connection first, and then close the
+         * pager, see issue #3543 for the details. */
         sd_bus_flush_close_unref(bus);
         pager_close();
 
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 421434c814c..af39e431f59 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -615,6 +615,8 @@ int main(int argc, char*argv[]) {
         r = localectl_main(bus, argc, argv);
 
 finish:
+        /* make sure we terminate the bus connection first, and then close the
+         * pager, see issue #3543 for the details. */
         sd_bus_flush_close_unref(bus);
         pager_close();
 
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 24d9facfa85..c811ee6c5e2 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -1607,8 +1607,9 @@ int main(int argc, char *argv[]) {
         r = loginctl_main(argc, argv, bus);
 
 finish:
+        /* make sure we terminate the bus connection first, and then close the
+         * pager, see issue #3543 for the details. */
         sd_bus_flush_close_unref(bus);
-
         pager_close();
         polkit_agent_close();
 
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index ad6efc10c4d..75743ce6a69 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -3166,6 +3166,8 @@ int main(int argc, char*argv[]) {
         r = machinectl_main(argc, argv, bus);
 
 finish:
+        /* make sure we terminate the bus connection first, and then close the
+         * pager, see issue #3543 for the details. */
         sd_bus_flush_close_unref(bus);
         pager_close();
         polkit_agent_close();
diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index cd371268ce3..0cd9f07094a 100644
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -1670,8 +1670,9 @@ int main(int argc, char* argv[]) {
         }
 
 finish:
+        /* make sure we terminate the bus connection first, and then close the
+         * pager, see issue #3543 for the details. */
         bus = sd_bus_flush_close_unref(bus);
-
         pager_close();
 
         free(arg_mount_what);
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index 4cc3c58ab42..19a382c1b20 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -493,6 +493,8 @@ int main(int argc, char *argv[]) {
         r = timedatectl_main(bus, argc, argv);
 
 finish:
+        /* make sure we terminate the bus connection first, and then close the
+         * pager, see issue #3543 for the details. */
         sd_bus_flush_close_unref(bus);
         pager_close();