SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: move more intellegince into parse_proc_cmdline()

Browse Source 
Already split variable assignments before invoking the callback. And
drop "rd." settings if we are not in an initrd.
This commit is contained in:
Lennart Poettering
2014-03-06 18:48:22 +01:00
parent 27d14fb331
commit 059cb3858a
8 changed files with 182 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules-load/modules-load.c
+4 -11
View File
@@ -69,20 +69,13 @@ static int add_modules(const char *p) {
return 0;
}
static int parse_proc_cmdline_word(const char *word) {
static int parse_proc_cmdline_item(const char *key, const char *value) {
int r;
if (startswith(word, "modules-load=")) {
r = add_modules(word + 13);
if (STR_IN_SET(key, "modules-load", "rd.modules-load") && value) {
r = add_modules(value);
if (r < 0)
return r;
} else if (startswith(word, "rd.modules-load=")) {
if (in_initrd()) {
r = add_modules(word + 16);
if (r < 0)
return r;
}
}
return 0;
@@ -253,7 +246,7 @@ int main(int argc, char *argv[]) {
umask(0022);
if (parse_proc_cmdline(parse_proc_cmdline_word) < 0)
if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
return EXIT_FAILURE;
ctx = kmod_new(NULL, NULL);