Merge pull request #27867 from keszybz/vconsole-reload-again

Restore ordering between vconsole-setup and firstboot services
2023-07-14 23:06:18 +01:00
parent 2c941b4e07 8623dab880
commit 9027aff9d4
14 changed files with 69 additions and 66 deletions
@@ -145,12 +145,11 @@ bool is_clean_exit(int code, int status, ExitClean clean, const ExitStatusSet *s
                        bitmap_isset(&success_status->status, status));

        /* If a daemon does not implement handlers for some of the signals, we do not consider this an
-           unclean shutdown */
+         * unclean shutdown */
        if (code == CLD_KILLED)
-                return
-                        (clean == EXIT_CLEAN_DAEMON && IN_SET(status, SIGHUP, SIGINT, SIGTERM, SIGPIPE)) ||
-                        (success_status &&
-                         bitmap_isset(&success_status->signal, status));
+                return (clean == EXIT_CLEAN_DAEMON && IN_SET(status, SIGHUP, SIGINT, SIGTERM, SIGPIPE)) ||
+                       (success_status &&
+                        bitmap_isset(&success_status->signal, status));

        return false;
 }