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

fstab-generator: Unset kernel cmdline options if empty value is given

Browse Source
This commit is contained in:
Daan De Meyer
2023-05-11 14:44:16 +02:00
parent 200268c6db
commit 338da50141
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fstab-generator/fstab-generator.c
+6 -6
View File
@@ -1141,14 +1141,14 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
if (proc_cmdline_value_missing(key, value))
return 0;
return free_and_strdup_warn(&arg_root_what, value);
return free_and_strdup_warn(&arg_root_what, empty_to_null(value));
} else if (streq(key, "rootfstype")) {
if (proc_cmdline_value_missing(key, value))
return 0;
return free_and_strdup_warn(&arg_root_fstype, value);
return free_and_strdup_warn(&arg_root_fstype, empty_to_null(value));
} else if (streq(key, "rootflags")) {
@@ -1163,21 +1163,21 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
if (proc_cmdline_value_missing(key, value))
return 0;
return free_and_strdup_warn(&arg_root_hash, value);
return free_and_strdup_warn(&arg_root_hash, empty_to_null(value));
} else if (streq(key, "mount.usr")) {
if (proc_cmdline_value_missing(key, value))
return 0;
return free_and_strdup_warn(&arg_usr_what, value);
return free_and_strdup_warn(&arg_usr_what, empty_to_null(value));
} else if (streq(key, "mount.usrfstype")) {
if (proc_cmdline_value_missing(key, value))
return 0;
return free_and_strdup_warn(&arg_usr_fstype, value);
return free_and_strdup_warn(&arg_usr_fstype, empty_to_null(value));
} else if (streq(key, "mount.usrflags")) {
@@ -1192,7 +1192,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
if (proc_cmdline_value_missing(key, value))
return 0;
return free_and_strdup_warn(&arg_usr_hash, value);
return free_and_strdup_warn(&arg_usr_hash, empty_to_null(value));
} else if (streq(key, "rw") && !value)
arg_root_rw = true;