#include "log.h"
#include "mount-setup.h"
#include "hostname-setup.h"
+#include "loopback-setup.h"
#include "load-fragment.h"
#include "fdset.h"
if ((pid = fork()) < 0)
log_error("Failed to fork off crash shell: %s", strerror(errno));
else if (pid == 0) {
+ int fd;
+
+ if ((fd = acquire_terminal("/dev/console", false, true)) < 0) {
+ log_error("Failed to acquire terminal: %s", strerror(-fd));
+ _exit(1);
+ }
+
+ if (dup2(fd, STDIN_FILENO) < 0 ||
+ dup2(fd, STDOUT_FILENO) < 0 ||
+ dup2(fd, STDERR_FILENO) < 0) {
+ log_error("Failed to duplicate terminal fd: %s", strerror(errno));
+ _exit(1);
+ }
+
+ if (fd >= 3)
+ close_nointr_nofail(fd);
+
execl("/bin/sh", "/bin/sh", NULL);
log_error("execl() failed: %s", strerror(errno));
assert_se(sigaction(SIGABRT, &sa, NULL) == 0);
}
-static int console_setup(void) {
+static int console_setup(bool do_reset) {
int tty_fd = -1, null_fd = -1, r = 0;
/* If we are init, we connect stdout/stderr to /dev/console
release_terminal();
- if ((tty_fd = open_terminal("/dev/console", O_WRONLY)) < 0) {
+ if ((tty_fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY)) < 0) {
log_error("Failed to open /dev/console: %s", strerror(-tty_fd));
r = -tty_fd;
goto finish;
assert(tty_fd >= 3);
assert(null_fd >= 3);
- if (reset_terminal(tty_fd) < 0)
- log_error("Failed to reset /dev/console: %m");
+ if (do_reset)
+ if (reset_terminal(tty_fd) < 0)
+ log_error("Failed to reset /dev/console: %m");
if (dup2(tty_fd, STDOUT_FILENO) < 0 ||
dup2(tty_fd, STDERR_FILENO) < 0 ||
return -EINVAL;
}
+ /* PID 1 will get the kernel arguments as parameters, which we
+ * ignore and unconditionally read from
+ * /proc/cmdline. However, we need to ignore those arguments
+ * here. */
+ if (running_as != MANAGER_INIT && optind < argc) {
+ log_error("Excess arguments.");
+ return -EINVAL;
+ }
+
return 0;
}
umask(0);
}
- if (running_as == MANAGER_INIT)
- console_setup();
+ /* Reset the console, but only if this is really init and we
+ * are freshly booted */
+ if (running_as == MANAGER_INIT && action == ACTION_RUN)
+ console_setup(getpid() == 1 && !serialization);
/* Make sure D-Bus doesn't fiddle with the SIGPIPE handlers */
dbus_connection_set_change_sigpipe(FALSE);
log_debug("systemd running in %s mode.", manager_running_as_to_string(running_as));
- if (running_as == MANAGER_INIT)
+ if (running_as == MANAGER_INIT) {
hostname_setup();
+ loopback_setup();
+ }
if ((r = manager_new(running_as, confirm_spawn, &m)) < 0) {
log_error("Failed to allocate manager object: %s", strerror(-r));
}
if ((r = manager_startup(m, serialization, fds)) < 0)
- log_error("Failed to fully startup daemon: %s", strerror(-r));
+ log_error("Failed to fully start up daemon: %s", strerror(-r));
if (fds) {
/* This will close all file descriptors that were opened, but
}
if (action == ACTION_TEST) {
- printf("→ By units:\n");
+ printf("-> By units:\n");
manager_dump_units(m, stdout, "\t");
}
}
if (action == ACTION_TEST) {
- printf("→ By jobs:\n");
+ printf("-> By jobs:\n");
manager_dump_jobs(m, stdout, "\t");
retval = 0;
goto finish;
break;
case MANAGER_REEXECUTE:
-
if (prepare_reexecute(m, &serialization, &fds) < 0)
goto finish;