chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: add kernel option to enable confirm_spawn
[elogind.git]
/
main.c
diff --git
a/main.c
b/main.c
index 3e2bfe10ca94b5ed384a9e6ca205d848c5de8e08..802e2ae9f33d1d518460c315b1391c35356b79a5 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-110,9
+110,19
@@
_noreturn static void crash(int sig) {
chvt(crash_chvt);
if (crash_shell) {
chvt(crash_chvt);
if (crash_shell) {
+ sigset_t mask;
+
log_info("Executing crash shell in 10s...");
sleep(10);
log_info("Executing crash shell in 10s...");
sleep(10);
+ /* Make sure the signal is not delivered inside the
+ * exec() */
+ assert_se(sigemptyset(&mask) == 0);
+ assert_se(sigaddset(&mask, sig) == 0);
+ assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0);
+
+ ignore_signal(sig);
+
execl("/bin/sh", "/bin/sh", NULL);
log_error("execl() failed: %s", strerror(errno));
}
execl("/bin/sh", "/bin/sh", NULL);
log_error("execl() failed: %s", strerror(errno));
}
@@
-240,6
+250,15
@@
static int parse_proc_cmdline_word(const char *word) {
else
crash_shell = r;
else
crash_shell = r;
+
+ } else if (startswith(word, "systemd.confirm_spawn=")) {
+ int r;
+
+ if ((r = parse_boolean(word + 22)) < 0)
+ log_warning("Failed to parse confirm spawn switch %s, Ignoring.", word + 22);
+ else
+ confirm_spawn = r;
+
} else if (startswith(word, "systemd.crash_chvt=")) {
int k;
} else if (startswith(word, "systemd.crash_chvt=")) {
int k;
@@
-259,6
+278,7
@@
static int parse_proc_cmdline_word(const char *word) {
log_info("systemd.dump_core=0|1 Dump core on crash");
log_info("systemd.crash_shell=0|1 On crash run shell");
log_info("systemd.crash_chvt=N Change to VT #N on crash");
log_info("systemd.dump_core=0|1 Dump core on crash");
log_info("systemd.crash_shell=0|1 On crash run shell");
log_info("systemd.crash_chvt=N Change to VT #N on crash");
+ log_info("systemd.confirm_spawn=0|1 Confirm every process spawn");
} else {
unsigned i;
} else {
unsigned i;
@@
-567,5
+587,8
@@
finish:
dbus_shutdown();
dbus_shutdown();
+ if (getpid() == 1)
+ freeze();
+
return retval;
}
return retval;
}