An error of -1 from parse_mount() indicates that the specification

was invalid. Don't trigger a mount failure (which by default means
a panic), but instead just move on to the next directive in the
configuration. This typically has us ask for the root mount.

PR:		163245
This commit is contained in:
Marcel Moolenaar 2015-08-27 04:25:27 +00:00
parent 5d6961b0dc
commit 898b510468
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=287190

View File

@ -791,6 +791,11 @@ vfs_mountroot_parse(struct sbuf *sb, struct mount *mpdevfs)
break;
default:
error = parse_mount(&conf);
if (error == -1) {
printf("mountroot: invalid file system "
"specification.\n");
error = 0;
}
break;
}
if (error < 0)