sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cosmetic boot fix.

Browse source 
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."
This commit is contained in:
Antoine Leca 2012-02-24 13:29:10 +01:00 committed by Ben Gras
parent c543dcf205
commit adb5107e26
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/arch/i386/stand/lib/exec.c
View file

@ -298,8 +298,9 @@ common_load_kernel(const char *file, u_long *basemem, u_long *extmem,
close(fd); close(fd);
/* Now we know the root fs type, load modules for it. */ /* Now we know the root fs type, load modules for it. */
module_add(fsmod); if (fsmod != NULL)
if (fsmod2 != NULL && strcmp(fsmod, fsmod2) != 0) module_add(fsmod);
if (fsmod !=NULL && fsmod2 != NULL && strcmp(fsmod, fsmod2) != 0)
module_add(fsmod2); module_add(fsmod2);
/* /*

4
sys/lib/libsa/globals.c
View file

@ -19,7 +19,11 @@ u_char bcea[6] = BA; /* broadcast ethernet address */
char rootpath[FNAME_SIZE]; /* root mount path */ char rootpath[FNAME_SIZE]; /* root mount path */
char bootfile[FNAME_SIZE]; /* bootp says to boot this */ char bootfile[FNAME_SIZE]; /* bootp says to boot this */
char hostname[FNAME_SIZE]; /* our hostname */ char hostname[FNAME_SIZE]; /* our hostname */
#ifdef __minix
char *fsmod = NULL;
#else
char *fsmod = "ffs"; /* guessed file system module name */ char *fsmod = "ffs"; /* guessed file system module name */
#endif
char *fsmod2; /* a requisite module */ char *fsmod2; /* a requisite module */
struct in_addr myip; /* my ip address */ struct in_addr myip; /* my ip address */
struct in_addr rootip; /* root ip address */ struct in_addr rootip; /* root ip address */