Author: marcel
Date: Thu Aug 27 04:25:27 2015
New Revision: 287190
URL: https://svnweb.freebsd.org/changeset/base/287190
Log:
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
Modified:
head/sys/kern/vfs_mountroot.c
Modified: head/sys/kern/vfs_mountroot.c
==============================================================================
--- head/sys/kern/vfs_mountroot.c Thu Aug 27 03:47:56 2015
(r287189)
+++ head/sys/kern/vfs_mountroot.c Thu Aug 27 04:25:27 2015
(r287190)
@@ -791,6 +791,11 @@ retry:
break;
default:
error = parse_mount(&conf);
+ if (error == -1) {
+ printf("mountroot: invalid file system "
+ "specification.\n");
+ error = 0;
+ }
break;
}
if (error < 0)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
