picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

suppress status message output at shutdown when 'quiet' is given

Browse source
This commit is contained in:
Kay Sievers 2013-07-05 00:32:05 +02:00
parent c1eba3008c
commit ec26be514f
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/main.c
View file

@ -1942,9 +1942,9 @@ finish:
watchdog_close(true);
}
/* avoid the creation of new processes forked by the kernel; at this
/* avoid the creation of new processes forked by the kernel; at this
* point, we will not listen to the signals anyway */
cg_uninstall_release_agent(SYSTEMD_CGROUP_CONTROLLER);
cg_uninstall_release_agent(SYSTEMD_CGROUP_CONTROLLER);
execve(SYSTEMD_SHUTDOWN_BINARY_PATH, (char **) command_line, env_block);
free(env_block);

15
src/core/shutdown.c
View file

@ -39,6 +39,7 @@
#include "missing.h"
#include "log.h"
#include "fileio.h"
#include "umount.h"
#include "util.h"
#include "mkdir.h"
@ -130,12 +131,26 @@ static int pivot_to_new_root(void) {
}
int main(int argc, char *argv[]) {
_cleanup_free_ char *line = NULL;
int cmd, r;
unsigned retries;
bool need_umount = true, need_swapoff = true, need_loop_detach = true, need_dm_detach = true;
bool in_container, use_watchdog = false;
char *arguments[3];
/* suppress shutdown status output if 'quiet' is used */
r = read_one_line_file("/proc/cmdline", &line);
if (r >= 0) {
char *w, *state;
size_t l;
FOREACH_WORD_QUOTED(w, l, line, state)
if (streq(w, "quiet")) {
log_set_max_level(LOG_WARNING);
break;
}
}
log_parse_environment();
log_set_target(LOG_TARGET_CONSOLE); /* syslog will die if not gone yet */
log_open();