Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable LOAD_NOTE on floppy boot. Fixes PR install/38943 on news68k. 

news68k uses single boot floppy, but this still prevents extra seek
across a whole kernel in ustarfs.
This commit is contained in:
tsutsui 2009-01-20 13:35:28 +00:00
parent b5ed1e6cdb
commit 210594d64a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/arch/news68k/stand/boot/boot.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: boot.c,v 1.16 2008/07/16 13:19:20 tsutsui Exp $ */ /* $NetBSD: boot.c,v 1.17 2009/01/20 13:35:28 tsutsui Exp $ */
/*- /*-
* Copyright (c) 1999 Izumi Tsutsui. All rights reserved. * Copyright (c) 1999 Izumi Tsutsui. All rights reserved.
@ -83,6 +83,7 @@ boot(uint32_t d4, uint32_t d5, uint32_t d6, uint32_t d7)
u_long marks[MARK_MAX]; u_long marks[MARK_MAX];
static char devname[32], file[32]; static char devname[32], file[32];
void (*entry)(void); void (*entry)(void);
int loadflag;
printf("%s Secondary Boot, Revision %s (from NetBSD %s)\n", printf("%s Secondary Boot, Revision %s (from NetBSD %s)\n",
bootprog_name, bootprog_rev, bootprog_kernrev); bootprog_name, bootprog_rev, bootprog_kernrev);
@ -122,10 +123,15 @@ boot(uint32_t d4, uint32_t d5, uint32_t d6, uint32_t d7)
kernels[1] = NULL; kernels[1] = NULL;
} }
/* disable LOAD_NOTE on floppy to avoid backward seek across volumes */
loadflag = LOAD_KERNEL;
if (devname[0] == 'f') /* XXX */
loadflag &= ~LOAD_NOTE;
for (i = 0; kernels[i]; i++) { for (i = 0; kernels[i]; i++) {
sprintf(file, "%s%s", devname, kernels[i]); sprintf(file, "%s%s", devname, kernels[i]);
DPRINTF("trying %s...\n", file); DPRINTF("trying %s...\n", file);
fd = loadfile(file, marks, LOAD_KERNEL); fd = loadfile(file, marks, loadflag);
if (fd != -1) if (fd != -1)
break; break;
} }