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

fstab-generator: respect noauto/nofail when adding sysroot mount 

Currently we don't respect noauto/nofail root mount options (from
rootflags kernel cmdline). We should map these two flags to the
corresponding boolean variable noauto and nofail when calling
add_mount().
This commit is contained in:
WANG Chao 2013-08-08 15:18:11 +08:00 committed by Tom Gundersen
parent 689a97f523
commit 21d1a67863
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -492,6 +492,7 @@ static int parse_new_root_from_proc_cmdline(void) {
char *w, *state;
int r;
size_t l;
bool noauto, nofail;
r = read_one_line_file("/proc/cmdline", &line);
if (r < 0) {
@ -547,6 +548,9 @@ static int parse_new_root_from_proc_cmdline(void) {
}
}
noauto = !!strstr(opts, "noauto");
nofail = !!strstr(opts, "nofail");
if (!what) {
log_debug("Could not find a root= entry on the kernel commandline.");
return 0;
@ -558,7 +562,7 @@ static int parse_new_root_from_proc_cmdline(void) {
}
log_debug("Found entry what=%s where=/sysroot type=%s", what, type);
r = add_mount(what, "/sysroot", type, opts, 0, false, false, false,
r = add_mount(what, "/sysroot", type, opts, 0, noauto, nofail, false,
false, NULL, NULL, NULL, SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
return (r < 0) ? r : 0;