timer: support timers that can resume the system from suspend

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

diff --git a/src/core/main.c b/src/core/main.c
index 6ebfe64187d994916de8c9479e64100a8136d1a7..e0fbb6e147b851f9d56d86be3715eb3088764e84 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -240,7 +240,7 @@ static int console_setup(bool do_reset) {
         if (r < 0)
                 log_error("Failed to reset /dev/console: %s", strerror(-r));
 
-        close_nointr_nofail(tty_fd);
+        safe_close(tty_fd);
         return r;
 }
 
@@ -1582,7 +1582,7 @@ int main(int argc, char *argv[]) {
                         kmod_setup();
 #endif
                 hostname_setup();
-                machine_id_setup();
+                machine_id_setup("");
                 loopback_setup();
 
                 test_mtab();
@@ -1994,7 +1994,7 @@ finish:
                 if (log_get_show_location())
                         command_line[pos++] = "--log-location";
 
-                assert(pos + 1 < ELEMENTSOF(command_line));
+                assert(pos < ELEMENTSOF(command_line));
 
                 if (arm_reboot_watchdog && arg_shutdown_watchdog > 0) {
                         char *e;