Module Name: src
Committed By: riz
Date: Fri Jul 15 22:43:59 UTC 2011
Modified Files:
src/sys/arch/mvme68k/stand/libsa [netbsd-5]: exec_mvme.c
src/sys/arch/sun68k/stand/tapeboot [netbsd-5]: boot.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1639):
sys/arch/sun68k/stand/tapeboot/boot.c: revision 1.7 via patch
sys/arch/mvme68k/stand/libsa/exec_mvme.c: revision 1.16 via patch
Disable LOAD_BACKWARDS on tapeboot which can't seek backwards.
Fixes bootstrap tapeboot installation failure on TME reported from ryoon@.
Should be pulled up to netbsd-5.
(note netbsd-5 uses LOAD_NOTE instead of LOAD_BACKWARDS)
Avoid backward seek on tape boot.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.20.1 src/sys/arch/mvme68k/stand/libsa/exec_mvme.c
cvs rdiff -u -r1.5 -r1.5.88.1 src/sys/arch/sun68k/stand/tapeboot/boot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mvme68k/stand/libsa/exec_mvme.c
diff -u src/sys/arch/mvme68k/stand/libsa/exec_mvme.c:1.15 src/sys/arch/mvme68k/stand/libsa/exec_mvme.c:1.15.20.1
--- src/sys/arch/mvme68k/stand/libsa/exec_mvme.c:1.15 Sat Jan 12 09:54:32 2008
+++ src/sys/arch/mvme68k/stand/libsa/exec_mvme.c Fri Jul 15 22:43:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_mvme.c,v 1.15 2008/01/12 09:54:32 tsutsui Exp $ */
+/* $NetBSD: exec_mvme.c,v 1.15.20.1 2011/07/15 22:43:59 riz Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993
@@ -56,7 +56,7 @@
lflags = LOAD_KERNEL;
if ((flag & RB_NOSYM) != 0 )
- lflags &= ~LOAD_SYM;
+ lflags &= ~(LOAD_SYM | LOAD_NOTE);
marks[MARK_START] = KERN_LOADADDR;
if ((fd = loadfile(file, marks, lflags)) == -1)
Index: src/sys/arch/sun68k/stand/tapeboot/boot.c
diff -u src/sys/arch/sun68k/stand/tapeboot/boot.c:1.5 src/sys/arch/sun68k/stand/tapeboot/boot.c:1.5.88.1
--- src/sys/arch/sun68k/stand/tapeboot/boot.c:1.5 Sun Dec 11 12:19:29 2005
+++ src/sys/arch/sun68k/stand/tapeboot/boot.c Fri Jul 15 22:43:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.5 2005/12/11 12:19:29 christos Exp $ */
+/* $NetBSD: boot.c,v 1.5.88.1 2011/07/15 22:43:59 riz Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993
@@ -107,7 +107,8 @@
printf("tapeboot: loading segment %s\n", file);
marks[MARK_START] = mark_start;
- if ((fd = loadfile(file, marks, LOAD_KERNEL)) != -1) {
+ if ((fd = loadfile(file, marks,
+ LOAD_KERNEL & ~LOAD_NOTE)) != -1) {
break;
}
printf("tapeboot: segment %s: %s\n", file, strerror(errno));
