Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/stand/lib/exec.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/stand/lib/exec.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.9.2.1.2.1 retrieving revision 1.10 diff -u -p -r1.9.2.1.2.1 -r1.10 --- src/sys/arch/i386/stand/lib/exec.c 1999/06/21 00:50:04 1.9.2.1.2.1 +++ src/sys/arch/i386/stand/lib/exec.c 1999/04/08 18:21:15 1.10 @@ -1,4 +1,4 @@ -/* $NetBSD: exec.c,v 1.9.2.1.2.1 1999/06/21 00:50:04 thorpej Exp $ */ +/* $NetBSD: exec.c,v 1.10 1999/04/08 18:21:15 drochner Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -60,8 +60,6 @@ #include "bootinfo.h" #ifdef COMPAT_OLDBOOT -static int dev2major __P((char *, int *)); - static int dev2major(devname, major) char *devname; @@ -107,8 +105,7 @@ exec_netbsd(file, loadaddr, boothowto) #endif #ifdef DEBUG - printf("exec: file=%s loadaddr=0x%lx\n", - file ? file : "NULL", loadaddr); + printf("exec: file=%s loadaddr=0x%lx\n", file, loadaddr); #endif BI_ALLOC(6); /* ??? */ @@ -134,7 +131,7 @@ exec_netbsd(file, loadaddr, boothowto) * Get the size of the kernel */ marks[MARK_START] = loadaddr; - if ((fd = loadfile(file, marks, COUNT_KERNEL)) == -1) + if ((fd = loadfile(file, marks, COUNT_ALL)) == -1) goto out; close(fd); @@ -147,7 +144,7 @@ exec_netbsd(file, loadaddr, boothowto) } #endif marks[MARK_START] = loadaddr; - if ((fd = loadfile(file, marks, LOAD_KERNEL)) == -1) + if ((fd = loadfile(file, marks, LOAD_ALL)) == -1) goto out; boot_argv[0] = boothowto;