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 18c65c5a34d80d042185b8e8efe25202146ad7cb..f8c43b5079ca180432e5f5acf1f350a9295ff341 100644 (file)
--- 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 421434c814ca5cfd63d0e5da6bf1922318303d54..af39e431f59dbb58209f71c149792b85cb13230c 100644 (file)
--- 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 24d9facfa85886995fe0bb8c7efb921ed1fa7eda..c811ee6c5e21bc6c3dca8b918a60dfb1cbcfbf98 100644 (file)
--- 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 ad6efc10c4d97cc63001e68e01340d0f921323f0..75743ce6a694d83b2c559bfd26b1b3be9672978c 100644 (file)
--- 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 cd371268ce3a6962346e51e4103047613f4831fa..0cd9f07094a07008a029d0473a6d67538c8187df 100644 (file)
--- 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 4cc3c58ab42a69ac257e98ae46fb9aed8cd49187..19a382c1b20c094a4699d52e3c6da25b64253d79 100644 (file)
--- 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();