Prep v233: Add missing updates from upstream in src/login

diff --git a/src/login/eloginctl.c b/src/login/eloginctl.c
index dd0a89d383290e8dcab89e7c577e1c32adfc4fa4..a1863a92ca8f80f58238e47aa4efbbf4872b13f0 100644 (file)
--- a/src/login/eloginctl.c
+++ b/src/login/eloginctl.c
@@ -209,49 +209,49 @@ static void elogind_log_special(enum elogind_action a) {
         case ACTION_HALT:
                 log_struct(LOG_INFO,
                            LOG_MESSAGE("Halt action called."),
-                           LOG_MESSAGE_ID(SD_MESSAGE_SHUTDOWN),
+                           "MESSAGE_ID=" SD_MESSAGE_SHUTDOWN_STR,
                            NULL);
                 break;
         case ACTION_POWEROFF:
                 log_struct(LOG_INFO,
                            LOG_MESSAGE("Poweroff action called."),
-                           LOG_MESSAGE_ID(SD_MESSAGE_SHUTDOWN),
+                           "MESSAGE_ID=" SD_MESSAGE_SHUTDOWN_STR,
                            NULL);
                 break;
         case ACTION_REBOOT:
                 log_struct(LOG_INFO,
                            LOG_MESSAGE("Reboot action called."),
-                           LOG_MESSAGE_ID(SD_MESSAGE_SHUTDOWN),
+                           "MESSAGE_ID=" SD_MESSAGE_SHUTDOWN_STR,
                            NULL);
                 break;
         case ACTION_KEXEC:
                 log_struct(LOG_INFO,
                            LOG_MESSAGE("KExec action called."),
-                           LOG_MESSAGE_ID(SD_MESSAGE_SHUTDOWN),
+                           "MESSAGE_ID=" SD_MESSAGE_SHUTDOWN_STR,
                            NULL);
                 break;
         case ACTION_SUSPEND:
                 log_struct(LOG_INFO,
                            LOG_MESSAGE("Suspend action called."),
-                           LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_START),
+                           "MESSAGE_ID=" SD_MESSAGE_SLEEP_START_STR,
                            NULL);
                 break;
         case ACTION_HIBERNATE:
                 log_struct(LOG_INFO,
                            LOG_MESSAGE("Hibernate action called."),
-                           LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_START),
+                           "MESSAGE_ID=" SD_MESSAGE_SLEEP_START_STR,
                            NULL);
                 break;
         case ACTION_HYBRID_SLEEP:
                 log_struct(LOG_INFO,
                            LOG_MESSAGE("Hybrid-Sleep action called."),
-                           LOG_MESSAGE_ID(SD_MESSAGE_SLEEP_START),
+                           "MESSAGE_ID=" SD_MESSAGE_SLEEP_START_STR,
                            NULL);
                 break;
         case ACTION_CANCEL_SHUTDOWN:
                 log_struct(LOG_INFO,
                            LOG_MESSAGE("Cancel Shutdown called."),
-                           LOG_MESSAGE_ID(SD_MESSAGE_SHUTDOWN),
+                           "MESSAGE_ID=" SD_MESSAGE_SHUTDOWN_STR,
                            NULL);
                 break;
         default:

diff --git a/src/login/elogind-dbus.c b/src/login/elogind-dbus.c
index a35ca1708d6b5301af0493dc4cc068ac386460b9..23ea9bd394a0b60357fafdee61662b8c02c4a3f7 100644 (file)
--- a/src/login/elogind-dbus.c
+++ b/src/login/elogind-dbus.c
@@ -90,7 +90,7 @@ static int bus_manager_log_shutdown(
                 p = strjoina(p, " (", m->wall_message, ").");
 
         return log_struct(LOG_NOTICE,
-                          LOG_MESSAGE_ID(SD_MESSAGE_SHUTDOWN),
+                          "MESSAGE_ID=" SD_MESSAGE_SHUTDOWN_STR,
                           p,
                           q,
                           NULL);

diff --git a/src/login/elogind.c b/src/login/elogind.c
index 5da9ae6a2d7536462726c7cd7469ff9741a35b48..57d6fe433f9e42c7ebee70276a010836cf8e1720 100644 (file)
--- a/src/login/elogind.c
+++ b/src/login/elogind.c
@@ -145,7 +145,10 @@ int elogind_setup_cgroups_agent(Manager *m) {
         if (!MANAGER_IS_SYSTEM(m))
                 return 0;
 
-        if (cg_unified(SYSTEMD_CGROUP_CONTROLLER) > 0) /* We don't need this anymore on the unified hierarchy */
+        r = cg_unified_controller(SYSTEMD_CGROUP_CONTROLLER);
+        if (r < 0)
+                return log_error_errno(r, "Failed to determine whether unified cgroups hierarchy is used: %m");
+        if (r > 0) /* We don't need this anymore on the unified hierarchy */
                 return 0;
 
         if (m->cgroups_agent_fd < 0) {

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 598b931422d12110aaff60a2f6fb4e9b9bf9d401..971b447a7cacef640fdac75a0eb4f59f59b4218c 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1446,7 +1446,7 @@ static int bus_manager_log_shutdown(
                 p = strjoina(p, " (", m->wall_message, ").");
 
         return log_struct(LOG_NOTICE,
-                          LOG_MESSAGE_ID(SD_MESSAGE_SHUTDOWN),
+                          "MESSAGE_ID=" SD_MESSAGE_SHUTDOWN_STR,
                           p,
                           q,
                           NULL);

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 84a46bf7bfca7543d8fce7231d2c27ca3510ca12..de27e713747af54953c4d7d6dea6fbddebcf8a96 100644 (file)
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -419,7 +419,7 @@ int seat_start(Seat *s) {
                 return 0;
 
         log_struct(LOG_INFO,
-                   LOG_MESSAGE_ID(SD_MESSAGE_SEAT_START),
+                   "MESSAGE_ID=" SD_MESSAGE_SEAT_START_STR,
                    "SEAT_ID=%s", s->id,
                    LOG_MESSAGE("New seat %s.", s->id),
                    NULL);
@@ -449,7 +449,7 @@ int seat_stop(Seat *s, bool force) {
 
         if (s->started)
                 log_struct(LOG_INFO,
-                           LOG_MESSAGE_ID(SD_MESSAGE_SEAT_STOP),
+                           "MESSAGE_ID=" SD_MESSAGE_SEAT_STOP_STR,
                            "SEAT_ID=%s", s->id,
                            LOG_MESSAGE("Removed seat %s.", s->id),
                            NULL);

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index b6456ce251b83c1fa64daa898753d941fd5d775e..bd2aac99a3351d3ebae4bc410d382c72fd99efe2 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -592,7 +592,7 @@ int session_start(Session *s) {
                 return r;
 
         log_struct(s->class == SESSION_BACKGROUND ? LOG_DEBUG : LOG_INFO,
-                   LOG_MESSAGE_ID(SD_MESSAGE_SESSION_START),
+                   "MESSAGE_ID=" SD_MESSAGE_SESSION_START_STR,
                    "SESSION_ID=%s", s->id,
                    "USER_ID=%s", s->user->name,
                    "LEADER="PID_FMT, s->leader,
@@ -718,7 +718,7 @@ int session_finalize(Session *s) {
 
         if (s->started)
                 log_struct(s->class == SESSION_BACKGROUND ? LOG_DEBUG : LOG_INFO,
-                           LOG_MESSAGE_ID(SD_MESSAGE_SESSION_STOP),
+                           "MESSAGE_ID=" SD_MESSAGE_SESSION_STOP_STR,
                            "SESSION_ID=%s", s->id,
                            "USER_ID=%s", s->user->name,
                            "LEADER="PID_FMT, s->leader,