Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/atari/stand Change the name of the tertiary boot to...



details:   https://anonhg.NetBSD.org/src/rev/d82f7da5d697
branches:  trunk
changeset: 516054:d82f7da5d697
user:      leo <leo%NetBSD.org@localhost>
date:      Sun Oct 14 19:43:44 2001 +0000

description:
Change the name of the tertiary boot to /boot.atari. This was a suggestion
from Matthew Green. It would still allow multi-platform boots.
Thus, the second level loader first tries /boot.atari and uses /boot as a
fallback.

diffstat:

 sys/arch/atari/stand/bootxx/bootxx.c  |  12 +++++++-----
 sys/arch/atari/stand/bootxxx/Makefile |   4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (48 lines):

diff -r dafd2dd8e51c -r d82f7da5d697 sys/arch/atari/stand/bootxx/bootxx.c
--- a/sys/arch/atari/stand/bootxx/bootxx.c      Sun Oct 14 19:21:45 2001 +0000
+++ b/sys/arch/atari/stand/bootxx/bootxx.c      Sun Oct 14 19:43:44 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bootxx.c,v 1.6 2001/10/13 20:22:56 leo Exp $   */
+/*     $NetBSD: bootxx.c,v 1.7 2001/10/14 19:43:44 leo Exp $   */
 
 /*
  * Copyright (c) 1995 Waldi Ravens.
@@ -65,7 +65,7 @@
        setheap(end, (void*)(LOADADDR3 - 4));
 
        printf("\033v\nNetBSD/Atari secondary bootloader"
-                                               " ($Revision: 1.6 $)\n\n");
+                                               " ($Revision: 1.7 $)\n\n");
 
        if (init_dskio(readsector, disklabel, -1))
                return(-1);
@@ -184,9 +184,11 @@
        /*
         * Read booter's exec-header.
         */
-       if ((fd = open("/boot", 0)) < 0) {
-               printf("Cannot open /boot.\n");
-               return (-1);
+       if ((fd = open("/boot.atari", 0)) < 0) {
+               if ((fd = open("/boot", 0)) < 0) {
+                       printf("Cannot open /boot{.atari}\n");
+                       return (-1);
+               }
        }
        while((bsize = read(fd, bstart, 1024)) > 0) {
                bstart += bsize;
diff -r dafd2dd8e51c -r d82f7da5d697 sys/arch/atari/stand/bootxxx/Makefile
--- a/sys/arch/atari/stand/bootxxx/Makefile     Sun Oct 14 19:21:45 2001 +0000
+++ b/sys/arch/atari/stand/bootxxx/Makefile     Sun Oct 14 19:43:44 2001 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2001/10/13 20:06:57 leo Exp $
+#      $NetBSD: Makefile,v 1.2 2001/10/14 19:43:44 leo Exp $
 
 # for OBJECT_FMT
 .include <bsd.own.mk>
 
-PROG=  boot
+PROG=  boot.atari
 #
 # Warning: bootxxx.c should be the first source!
 #



Home | Main Index | Thread Index | Old Index