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

6 files changed, 12 insertions, 2 deletions

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 18c65c5a34..f8c43b5079 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 421434c814..af39e431f5 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 24d9facfa8..c811ee6c5e 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 ad6efc10c4..75743ce6a6 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 cd371268ce..0cd9f07094 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 4cc3c58ab4..19a382c1b2 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();