Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/vax/boot/boot Support loading the kernel from ustarfs.



details:   https://anonhg.NetBSD.org/src/rev/2b6119584a17
branches:  trunk
changeset: 474179:2b6119584a17
user:      ragge <ragge%NetBSD.org@localhost>
date:      Wed Jun 30 18:30:42 1999 +0000

description:
Support loading the kernel from ustarfs.

diffstat:

 sys/arch/vax/boot/boot/conf.c    |  10 +++++-----
 sys/arch/vax/boot/boot/devopen.c |   4 +---
 2 files changed, 6 insertions(+), 8 deletions(-)

diffs (56 lines):

diff -r 1af7382c47fa -r 2b6119584a17 sys/arch/vax/boot/boot/conf.c
--- a/sys/arch/vax/boot/boot/conf.c     Wed Jun 30 18:23:02 1999 +0000
+++ b/sys/arch/vax/boot/boot/conf.c     Wed Jun 30 18:30:42 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.c,v 1.1 1999/03/06 16:36:05 ragge Exp $ */
+/*     $NetBSD: conf.c,v 1.2 1999/06/30 18:30:42 ragge Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -40,6 +40,7 @@
 #include "lib/libsa/stand.h"
 #include "lib/libsa/ufs.h"
 #include "lib/libsa/nfs.h"
+#include "lib/libsa/ustarfs.h"
 
 #include "vaxstand.h"
 
@@ -83,10 +84,9 @@
 int     ndevs = (sizeof(devsw)/sizeof(devsw[0]));
 
 struct fs_ops file_system[] = {
-       { ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat }
-};
-
-struct fs_ops nfs_system[] = {
+       { ustarfs_open, ustarfs_close, ustarfs_read, ustarfs_write,
+           ustarfs_seek, ustarfs_stat },
+       { ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat },
        { nfs_open, nfs_close, nfs_read, nfs_write, nfs_seek, nfs_stat },
 };
 
diff -r 1af7382c47fa -r 2b6119584a17 sys/arch/vax/boot/boot/devopen.c
--- a/sys/arch/vax/boot/boot/devopen.c  Wed Jun 30 18:23:02 1999 +0000
+++ b/sys/arch/vax/boot/boot/devopen.c  Wed Jun 30 18:30:42 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: devopen.c,v 1.1 1999/03/06 16:36:05 ragge Exp $ */
+/*     $NetBSD: devopen.c,v 1.2 1999/06/30 18:30:42 ragge Exp $ */
 /*
  * Copyright (c) 1997 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -45,7 +45,6 @@
 {
        int dev, ctlr, unit, part, adapt, i, a[4], x;
        struct devsw *dp;
-       extern struct fs_ops nfs_system[];
        extern int cnvtab[];
        char *s, *c, *u;
 
@@ -111,7 +110,6 @@
        opendev = MAKEBOOTDEV(dev, adapt, ctlr, unit, part);
 
        if (dev > 95) { /* MOP boot over network, root & swap over NFS */
-               bcopy(nfs_system, file_system, sizeof(struct fs_ops));
                i = (*dp->dv_open)(f, dp->dv_name);
        } else
                i = (*dp->dv_open)(f, adapt, ctlr, unit, part);



Home | Main Index | Thread Index | Old Index