From: Antoine Leca <Antoine.Leca.1@gmail.com>
Date: Fri, 24 Feb 2012 12:29:10 +0000 (+0100)
Subject: Cosmetic boot fix.
X-Git-Tag: v3.2.1~693
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=adb5107e26e35b4842373ba329cd2aa2f9d5751f;p=minix.git

Cosmetic boot fix.

The NetBSD boot loader loads automatically the kernel module appropriate
for the detected root file system; it is preset at "ffs".  The MINIX3fs
support does not reset the underlying global variable, since there are
no use for this on MINIX.  As a result, the boot loader searches for
/ffs.kmod, and issues two warnings about "module failure to open/load."
---

diff --git a/sys/arch/i386/stand/lib/exec.c b/sys/arch/i386/stand/lib/exec.c
index 45abbe187..8a283557b 100644
--- a/sys/arch/i386/stand/lib/exec.c
+++ b/sys/arch/i386/stand/lib/exec.c
@@ -298,8 +298,9 @@ common_load_kernel(const char *file, u_long *basemem, u_long *extmem,
 	close(fd);
 
 	/* Now we know the root fs type, load modules for it. */
-	module_add(fsmod);
-	if (fsmod2 != NULL && strcmp(fsmod, fsmod2) != 0)
+	if (fsmod != NULL)
+		module_add(fsmod);
+	if (fsmod !=NULL && fsmod2 != NULL && strcmp(fsmod, fsmod2) != 0)
 		module_add(fsmod2);
 
 	/*
diff --git a/sys/lib/libsa/globals.c b/sys/lib/libsa/globals.c
index c22960a71..bdd2061b4 100644
--- a/sys/lib/libsa/globals.c
+++ b/sys/lib/libsa/globals.c
@@ -19,7 +19,11 @@ u_char	bcea[6] = BA;			/* broadcast ethernet address */
 char	rootpath[FNAME_SIZE];		/* root mount path */
 char	bootfile[FNAME_SIZE];		/* bootp says to boot this */
 char	hostname[FNAME_SIZE];		/* our hostname */
+#ifdef __minix
+char    *fsmod = NULL;
+#else
 char	*fsmod =  "ffs";		/* guessed file system module name */
+#endif
 char	*fsmod2;			/* a requisite module */
 struct	in_addr myip;			/* my ip address */
 struct	in_addr rootip;			/* root ip address */