Handle suspend, shutdown, reboot, etc within elogind

[elogind.git] / src / login / logind-seat.c

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 495ec50be06d21e1da86505f5c394b01c78b53af..1be8713754c3fec5503c8c8e06a6b8a9273fc3c4 100644 (file)
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -93,11 +93,11 @@ int seat_save(Seat *s) {
 
         r = mkdir_safe_label("/run/systemd/seats", 0755, 0, 0);
         if (r < 0)
-                goto finish;
+                goto fail;
 
         r = fopen_temporary(s->state_file, &f, &temp_path);
         if (r < 0)
-                goto finish;
+                goto fail;
 
         fchmod(fileno(f), 0644);
 
@@ -141,19 +141,24 @@ int seat_save(Seat *s) {
                                 i->sessions_by_seat_next ? ' ' : '\n');
         }
 
-        fflush(f);
+        r = fflush_and_check(f);
+        if (r < 0)
+                goto fail;
 
-        if (ferror(f) || rename(temp_path, s->state_file) < 0) {
+        if (rename(temp_path, s->state_file) < 0) {
                 r = -errno;
-                unlink(s->state_file);
-                unlink(temp_path);
+                goto fail;
         }
 
-finish:
-        if (r < 0)
-                log_error_errno(r, "Failed to save seat data %s: %m", s->state_file);
+        return 0;
 
-        return r;
+fail:
+        (void) unlink(s->state_file);
+
+        if (temp_path)
+                (void) unlink(temp_path);
+
+        return log_error_errno(r, "Failed to save seat data %s: %m", s->state_file);
 }
 
 int seat_load(Seat *s) {
@@ -164,6 +169,8 @@ int seat_load(Seat *s) {
         return 0;
 }
 
+/// UNNEEDED by elogind
+#if 0
 static int vt_allocate(unsigned int vtnr) {
         char p[sizeof("/dev/tty") + DECIMAL_STR_MAX(unsigned int)];
         _cleanup_close_ int fd = -1;
@@ -205,6 +212,7 @@ int seat_preallocate_vts(Seat *s) {
 
         return r;
 }
+#endif // 0
 
 int seat_apply_acls(Seat *s, Session *old_active) {
         int r;
@@ -356,7 +364,11 @@ int seat_active_vt_changed(Seat *s, unsigned int vtnr) {
         }
 
         r = seat_set_active(s, new_active);
+
+/// elogind does not spawn autovt
+#if 0
         manager_spawn_autovt(s->manager, vtnr);
+#endif // 0
 
         return r;
 }
@@ -415,7 +427,10 @@ int seat_start(Seat *s) {
                    NULL);
 
         /* Initialize VT magic stuff */
+/// elogind does not support autospawning vts
+#if 0
         seat_preallocate_vts(s);
+#endif // 0
 
         /* Read current VT */
         seat_read_active_vt(s);