if (r < 0)
log_error("Failed to reset /dev/console: %s", strerror(-r));
- close_nointr_nofail(tty_fd);
+ safe_close(tty_fd);
return r;
}
log_warning("Environment variable name '%s' is not valid. Ignoring.", value);
} else if (!streq(key, "systemd.restore_state") &&
+ !streq(key, "systemd.gpt_auto") &&
(startswith(key, "systemd.") || startswith(key, "rd.systemd."))) {
const char *c;
kmod_setup();
#endif
hostname_setup();
- machine_id_setup();
+ machine_id_setup("");
loopback_setup();
test_mtab();
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;