diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1998-09-29 07:14:54 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1998-09-29 07:14:54 +0000 |
| commit | 542bf35a8c49d8c3565f8e01d170428063bd9025 (patch) | |
| tree | 0ba6ba011743dfd0c3083c6f7294c18c0a17ca21 | |
| parent | c5ec46b0e1935c8715a145c8b3ebb3b0c842031b (diff) | |
update config
include (gzipped) diskless kernel if compiled in LIF volume
| -rw-r--r-- | sys/arch/hppa/stand/boot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/boot/conf.c | 17 |
2 files changed, 13 insertions, 8 deletions
diff --git a/sys/arch/hppa/stand/boot/Makefile b/sys/arch/hppa/stand/boot/Makefile index 23355e88af5..6a744f1a50f 100644 --- a/sys/arch/hppa/stand/boot/Makefile +++ b/sys/arch/hppa/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 1998/08/29 01:49:26 mickey Exp $ +# $OpenBSD: Makefile,v 1.4 1998/09/29 07:14:52 mickey Exp $ PROG= boot SRCS= srt0.S boot.c cmd.c vars.c bootarg.c conf.c @@ -24,7 +24,7 @@ all: boot.lif .if exists(${.CURDIR}/../../compile/DISKLESS/bsd) diskless: ${.CURDIR}/../../compile/DISKLESS/bsd - cp ${.CURDIR}/../../compile/DISKLESS/bsd diskless + gzip -9c ${.CURDIR}/../../compile/DISKLESS/bsd > diskless ADDBOOT+=diskless .endif diff --git a/sys/arch/hppa/stand/boot/conf.c b/sys/arch/hppa/stand/boot/conf.c index a4d25853217..379a3b516a3 100644 --- a/sys/arch/hppa/stand/boot/conf.c +++ b/sys/arch/hppa/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.4 1998/07/14 17:20:29 mickey Exp $ */ +/* $OpenBSD: conf.c,v 1.5 1998/09/29 07:14:53 mickey Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -32,6 +32,7 @@ #include <sys/types.h> #include <libsa.h> +#include <machine/lifvar.h> #include <lib/libsa/ufs.h> #include <lib/libsa/cd9660.h> #ifdef notdef @@ -41,16 +42,18 @@ #include <lib/libsa/exec.h> #include <dev/cons.h> -const char version[] = "0.02"; -int debug; +const char version[] = "0.03"; +int debug = 0; const struct x_sw execsw[] = { { "elf", elf_probe, elf_load }, - { "som", som_probe, som_load }, +/* { "som", som_probe, som_load }, */ { "" , NULL, NULL }, }; struct fs_ops file_system[] = { + { lif_open, lif_close, lif_read, lif_write, lif_seek, + lif_stat, lif_readdir }, { ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat, ufs_readdir }, #ifdef notdef @@ -70,8 +73,9 @@ int n_netif_drivers = NENTS(netif_drivers); #endif struct devsw devsw[] = { - { "ct", ctstrategy, ctopen, ctclose, noioctl }, - { "dk", dkstrategy, dkopen, dkclose, noioctl }, + { "ct", iodcstrategy, ctopen, ctclose, noioctl }, + { "sd", iodcstrategy, dkopen, dkclose, noioctl }, + { "lf", iodcstrategy, lfopen, lfclose, noioctl } }; int ndevs = NENTS(devsw); @@ -80,3 +84,4 @@ struct consdev constab[] = { { NULL } }; struct consdev *cn_tab; + |