shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

util: simplify proc_cmdline() to reuse get_process_cmdline()

Browse Source 
Also, make all parsing of the kernel cmdline non-fatal.
This commit is contained in:
Lennart Poettering 2014-11-06 21:53:34 +01:00
parent f2997962ff
commit b5884878a2
15 changed files with 54 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/kmod-setup.c
View File

@ -47,7 +47,7 @@ static void systemd_kmod_log(
static bool cmdline_check_kdbus(void) {
_cleanup_free_ char *line = NULL;
if (proc_cmdline(&line) <= 0)
if (proc_cmdline(&line) < 0)
return false;
return strstr(line, "kdbus") != NULL;

8
src/core/main.c
View File

@ -1402,9 +1402,11 @@ int main(int argc, char *argv[]) {
if (parse_config_file() < 0)
goto finish;
if (arg_running_as == SYSTEMD_SYSTEM)
if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
goto finish;
if (arg_running_as == SYSTEMD_SYSTEM) {
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-r));
}
/* Note that this also parses bits from the kernel command
* line, including "debug". */

7
src/cryptsetup/cryptsetup-generator.c
View File

@ -308,7 +308,7 @@ int main(int argc, char *argv[]) {
_cleanup_strv_free_ char **disks_done = NULL;
_cleanup_fclose_ FILE *f = NULL;
unsigned n = 0;
int r = EXIT_FAILURE, r2 = EXIT_FAILURE;
int r = EXIT_FAILURE, r2 = EXIT_FAILURE, z;
char **i;
if (argc > 1 && argc != 4) {
@ -325,8 +325,9 @@ int main(int argc, char *argv[]) {
umask(0022);
if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
goto cleanup;
z = parse_proc_cmdline(parse_proc_cmdline_item);
if (z < 0)
log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-z));
if (!arg_enabled) {
r = r2 = EXIT_SUCCESS;

5
src/debug-generator/debug-generator.c
View File

@ -150,8 +150,9 @@ int main(int argc, char *argv[]) {
umask(0022);
if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
return EXIT_FAILURE;
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-r));
if (arg_debug_shell) {
r = strv_extend(&arg_wants, "debug-shell.service");

5
src/fsck/fsck.c
View File

@ -236,7 +236,10 @@ int main(int argc, char *argv[]) {
umask(0022);
parse_proc_cmdline(parse_proc_cmdline_item);
q = parse_proc_cmdline(parse_proc_cmdline_item);
if (q < 0)
log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-q));
test_files();
if (!arg_force && arg_skip)

5
src/fstab-generator/fstab-generator.c
View File

@ -593,8 +593,9 @@ int main(int argc, char *argv[]) {
umask(0022);
if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
return EXIT_FAILURE;
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-r));
/* Always honour root= and usr= in the kernel command line if we are in an initrd */
if (in_initrd()) {

5
src/gpt-auto-generator/gpt-auto-generator.c
View File

@ -772,8 +772,9 @@ int main(int argc, char *argv[]) {
return EXIT_SUCCESS;
}
if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
return EXIT_FAILURE;
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-r));
if (!arg_enabled) {
log_debug("Disabled, exiting.");

12
src/hibernate-resume/hibernate-resume-generator.c
View File

@ -45,6 +45,9 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
static int process_resume(void) {
_cleanup_free_ char *name = NULL, *lnk = NULL;
if (!arg_resume_dev)
return 0;
name = unit_name_from_path_instance("systemd-hibernate-resume", arg_resume_dev, ".service");
if (!name)
return log_oom();
@ -83,12 +86,11 @@ int main(int argc, char *argv[]) {
if (!in_initrd())
return EXIT_SUCCESS;
if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
return EXIT_FAILURE;
if (arg_resume_dev != NULL)
r = process_resume();
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-r));
r = process_resume();
free(arg_resume_dev);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;

4
src/journal/journald-server.c
View File

@ -1310,10 +1310,10 @@ static int server_parse_proc_cmdline(Server *s) {
int r;
r = proc_cmdline(&line);
if (r < 0)
if (r < 0) {
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
if (r <= 0)
return 0;
}
FOREACH_WORD_QUOTED(w, l, line, state) {
_cleanup_free_ char *word;

5
src/modules-load/modules-load.c
View File

@ -243,8 +243,9 @@ int main(int argc, char *argv[]) {
umask(0022);
if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
return EXIT_FAILURE;
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-r));
ctx = kmod_new(NULL, NULL);
if (!ctx) {

10
src/quotacheck/quotacheck.c
View File

@ -74,6 +74,7 @@ int main(int argc, char *argv[]) {
};
pid_t pid;
int r;
if (argc > 1) {
log_error("This program takes no arguments.");
@ -86,7 +87,10 @@ int main(int argc, char *argv[]) {
umask(0022);
parse_proc_cmdline(parse_proc_cmdline_item);
r = parse_proc_cmdline(parse_proc_cmdline_item);
if (r < 0)
log_warning("Failed to parse kernel command line, ignoring: %s", strerror(-r));
test_files();
if (!arg_force) {
@ -107,5 +111,7 @@ int main(int argc, char *argv[]) {
_exit(1); /* Operational error */
}
return wait_for_terminate_and_warn("quotacheck", pid) >= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
r = wait_for_terminate_and_warn("quotacheck", pid);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}

2
src/shared/condition.c
View File

@ -93,8 +93,6 @@ static int condition_test_kernel_command_line(Condition *c) {
r = proc_cmdline(&line);
if (r < 0)
return r;
if (r == 0)
return false;
equal = !!strchr(c->parameter, '=');
p = line;

35
src/shared/util.c
View File

@ -6153,11 +6153,8 @@ int shall_restore_state(void) {
r = proc_cmdline(&line);
if (r < 0)
return r;
if (r == 0) /* Container ... */
return 1;
r = 1;
FOREACH_WORD_QUOTED(word, l, line, state) {
const char *e;
char n[l+1];
@ -6179,30 +6176,12 @@ int shall_restore_state(void) {
}
int proc_cmdline(char **ret) {
int r;
assert(ret);
if (detect_container(NULL) > 0) {
char *buf = NULL, *p;
size_t sz = 0;
r = read_full_file("/proc/1/cmdline", &buf, &sz);
if (r < 0)
return r;
for (p = buf; p + 1 < buf + sz; p++)
if (*p == 0)
*p = ' ';
*p = 0;
*ret = buf;
return 1;
}
r = read_one_line_file("/proc/cmdline", ret);
if (r < 0)
return r;
return 1;
if (detect_container(NULL) > 0)
return get_process_cmdline(1, 0, false, ret);
else
return read_one_line_file("/proc/cmdline", ret);
}
int parse_proc_cmdline(int (*parse_item)(const char *key, const char *value)) {
@ -6215,9 +6194,7 @@ int parse_proc_cmdline(int (*parse_item)(const char *key, const char *value)) {
r = proc_cmdline(&line);
if (r < 0)
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
if (r <= 0)
return 0;
return r;
FOREACH_WORD_QUOTED(w, l, line, state) {
char word[l+1], *value;

7
src/udev/net/link-config.c
View File

@ -174,11 +174,10 @@ static bool enable_name_policy(void) {
size_t l;
r = proc_cmdline(&line);
if (r < 0)
log_warning("Failed to read /proc/cmdline, ignoring: %s",
strerror(-r));
if (r <= 0)
if (r < 0) {
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
return true;
}
FOREACH_WORD_QUOTED(word, l, line, state)
if (strneq(word, "net.ifnames=0", l))

4
src/udev/udevd.c
View File

@ -961,10 +961,10 @@ static void kernel_cmdline_options(struct udev *udev) {
int r;
r = proc_cmdline(&line);
if (r < 0)
if (r < 0) {
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
if (r <= 0)
return;
}
FOREACH_WORD_QUOTED(word, l, line, state) {
char *s, *opt, *value;