diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2020-03-12 19:19:38 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2020-03-12 19:19:38 +0000 |
| commit | 25992d68d86b5221f9d925929dd854e1a939869a (patch) | |
| tree | c1f5808994d0854727b9daec76d0ac118e245f37 | |
| parent | 3e2ce101a2b52bf0147010d03611551cee63f9fc (diff) | |
Allow hppa boot(8) to read from an ffs2 filesystem; ok kettenis@
| -rw-r--r-- | sys/arch/hppa/stand/boot/conf.c | 7 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/libsa/Makefile | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sys/arch/hppa/stand/boot/conf.c b/sys/arch/hppa/stand/boot/conf.c index 25757e1e8d0..0b8f0f1247d 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.34 2019/10/29 02:55:51 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.35 2020/03/12 19:19:37 otto Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -29,15 +29,18 @@ #include <sys/param.h> #include <libsa.h> #include <lib/libsa/ufs.h> +#include <lib/libsa/ufs2.h> #include <lib/libsa/cd9660.h> #include <dev/cons.h> -const char version[] = "1.8"; +const char version[] = "1.9"; int debug = 0; struct fs_ops file_system[] = { { ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat, ufs_readdir, ufs_fchmod }, + { ufs2_open, ufs2_close, ufs2_read, ufs2_write, ufs2_seek, + ufs2_stat, ufs2_readdir, ufs2_fchmod }, { cd9660_open, cd9660_close, cd9660_read, cd9660_write, cd9660_seek, cd9660_stat, cd9660_readdir }, { lif_open, lif_close, lif_read, lif_write, lif_seek, diff --git a/sys/arch/hppa/stand/libsa/Makefile b/sys/arch/hppa/stand/libsa/Makefile index e9f52c6976a..5aa85eb19f4 100644 --- a/sys/arch/hppa/stand/libsa/Makefile +++ b/sys/arch/hppa/stand/libsa/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2019/10/29 02:55:51 deraadt Exp $ +# $OpenBSD: Makefile,v 1.23 2020/03/12 19:19:37 otto Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -28,7 +28,7 @@ SRCS+= close.c closeall.c dev.c disklabel.c dkcksum.c fchmod.c fstat.c \ ioctl.c lseek.c open.c read.c stat.c write.c cread.c readdir.c cons.c # boot filesystems -SRCS+= ufs.c cd9660.c +SRCS+= ufs.c ufs2.c cd9660.c .PATH: ${DIR_SA} |