summaryrefslogtreecommitdiff
path: root/src/login/logind-seat.c
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2014-12-12 19:54:51 +0200
committerMartin Pitt <martin.pitt@ubuntu.com>2014-12-12 19:54:51 +0200
commitf47781d88ca6bf69d6b1dd0703b2b283482e5c09 (patch)
tree6a8f1f74e8fba0a2c20d710848d00b0338f6e341 /src/login/logind-seat.c
parent5eef597e931b0428bb984dc2bf0736d032a9198c (diff)
downloadsystemd-f47781d88ca6bf69d6b1dd0703b2b283482e5c09.tar.gz
Imported Upstream version 218
Diffstat (limited to 'src/login/logind-seat.c')
-rw-r--r--src/login/logind-seat.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 9992195151..8eb5e3ee0a 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -154,7 +154,7 @@ int seat_save(Seat *s) {
finish:
if (r < 0)
- log_error("Failed to save seat data %s: %s", s->state_file, strerror(-r));
+ log_error_errno(r, "Failed to save seat data %s: %m", s->state_file);
return r;
}
@@ -201,7 +201,7 @@ int seat_preallocate_vts(Seat *s) {
q = vt_allocate(i);
if (q < 0) {
- log_error("Failed to preallocate VT %i: %s", i, strerror(-q));
+ log_error_errno(q, "Failed to preallocate VT %i: %m", i);
r = q;
}
}
@@ -221,7 +221,7 @@ int seat_apply_acls(Seat *s, Session *old_active) {
!!s->active, s->active ? s->active->user->uid : 0);
if (r < 0)
- log_error("Failed to apply ACLs: %s", strerror(-r));
+ log_error_errno(r, "Failed to apply ACLs: %m");
return r;
}
@@ -400,9 +400,9 @@ int seat_start(Seat *s) {
return 0;
log_struct(LOG_INFO,
- MESSAGE_ID(SD_MESSAGE_SEAT_START),
+ LOG_MESSAGE_ID(SD_MESSAGE_SEAT_START),
"SEAT_ID=%s", s->id,
- "MESSAGE=New seat %s.", s->id,
+ LOG_MESSAGE("New seat %s.", s->id),
NULL);
/* Initialize VT magic stuff */
@@ -428,9 +428,9 @@ int seat_stop(Seat *s, bool force) {
if (s->started)
log_struct(LOG_INFO,
- MESSAGE_ID(SD_MESSAGE_SEAT_STOP),
+ LOG_MESSAGE_ID(SD_MESSAGE_SEAT_STOP),
"SEAT_ID=%s", s->id,
- "MESSAGE=Removed seat %s.", s->id,
+ LOG_MESSAGE("Removed seat %s.", s->id),
NULL);
seat_stop_sessions(s, force);