networkd: add basic dbus API

[elogind.git] / src / core / manager.c

diff --git a/src/core/manager.c b/src/core/manager.c
index 336ec1ed78269a013f48c487e13edef52fb075d8..5fba0043e4510119652867c83a79cb02064758d3 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1725,14 +1725,15 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
                 case SIGINT:
                         if (m->running_as == SYSTEMD_SYSTEM) {
 
-                                /* If the user presses C-A-D too more
-                                 * than 7 times within 2s, we reboot
+                                /* If the user presses C-A-D more than
+                                 * 7 times within 2s, we reboot
                                  * immediately. */
 
                                 if (ratelimit_test(&m->ctrl_alt_del_ratelimit))
                                         manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE_IRREVERSIBLY);
                                 else {
                                         log_notice("Ctrl-Alt-Del was pressed more than 7 times within 2s, rebooting immediately.");
+                                        status_printf(NULL, true, false, "Ctrl-Alt-Del was pressed more than 7 times within 2s, rebooting immediately.");
                                         m->exit_code = MANAGER_REBOOT;
                                 }
 
@@ -2105,8 +2106,7 @@ void manager_send_unit_audit(Manager *m, Unit *u, int type, bool success) {
                 return;
         }
 
-        msg = strappenda("unit=", p);
-
+        msg = strjoina("unit=", p);
         if (audit_log_user_comm_message(audit_fd, type, msg, "systemd", NULL, NULL, NULL, success) < 0) {
                 if (errno == EPERM)
                         /* We aren't allowed to send audit messages?