diff options
| author | jkh <jkh@FreeBSD.org> | 1998-10-30 01:36:40 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1998-10-30 01:36:40 +0000 |
| commit | af8d56d484f356ec2525eaa8977c1dc80758428f (patch) | |
| tree | fe773ce5c4b502203ee03b034ce1d222ea956aff | |
| parent | 573dce43831631424b13bfb386aed46aa17ea6a4 (diff) | |
| download | FreeBSD-src-af8d56d484f356ec2525eaa8977c1dc80758428f.zip FreeBSD-src-af8d56d484f356ec2525eaa8977c1dc80758428f.tar.gz | |
Fix this correctly - check if mfs_getimage() succeeds before settings
the MFS root unconditionally, just as on the x86.
Prompted by: msmith
| -rw-r--r-- | sys/alpha/alpha/autoconf.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/alpha/alpha/autoconf.c b/sys/alpha/alpha/autoconf.c index 205404f5..fc8f699 100644 --- a/sys/alpha/alpha/autoconf.c +++ b/sys/alpha/alpha/autoconf.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: autoconf.c,v 1.10 1998/09/26 14:48:19 dfr Exp $ + * $Id: autoconf.c,v 1.11 1998/10/06 08:38:04 dfr Exp $ */ #include "opt_bootp.h" @@ -217,9 +217,14 @@ cpu_rootconf() { #ifdef MFS_ROOT if (!mountrootfsname) { + extern u_char *mfs_getimage __P((void)); + if (bootverbose) printf("Considering MFS root f/s.\n"); - mountrootfsname = "mfs"; + if (mfs_getimage()) + mountrootfsname = "mfs"; + else if (bootverbose) + printf("No MFS image available as root f/s.\n"); } #endif |
