diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2020-03-21 14:54:07 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2020-03-21 14:54:07 +0000 |
| commit | 6532dda0fe0ac5f88f915a0d2ac2598f8aac7ac3 (patch) | |
| tree | 5283a5590fab61c19e547eb3a345352c370f0c79 /sys/arch/i386/stand/cdboot | |
| parent | a5a1f15ebaca9eb21483ec46e5427358077be47c (diff) | |
Teach i386 boot98) and friends about ffs2. fdboot(8) is the exception:
ffs2 support does not fit there. But the the kernel loaded by the
floppy ramdisk does support ffs2.
Diffstat (limited to 'sys/arch/i386/stand/cdboot')
| -rw-r--r-- | sys/arch/i386/stand/cdboot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/cdboot/conf.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sys/arch/i386/stand/cdboot/Makefile b/sys/arch/i386/stand/cdboot/Makefile index ac078073036..ed3b677bfc7 100644 --- a/sys/arch/i386/stand/cdboot/Makefile +++ b/sys/arch/i386/stand/cdboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2019/11/28 00:17:12 bluhm Exp $ +# $OpenBSD: Makefile,v 1.36 2020/03/21 14:54:06 otto Exp $ MAN= cdboot.8 @@ -34,7 +34,7 @@ SRCS+= alloc.c ctime.c exit.c getchar.c hexdump.c \ SRCS+= close.c closeall.c cons.c cread.c dev.c disklabel.c dkcksum.c fchmod.c \ fstat.c lseek.c open.c read.c readdir.c stat.c SRCS+= elf32.c elf64.c loadfile.c arc4.c -SRCS+= cd9660.c ufs.c +SRCS+= cd9660.c ufs.c ufs2.c SRCS+= aes_xts.c bcrypt_pbkdf.c blowfish.c explicit_bzero.c hmac_sha1.c \ pkcs5_pbkdf2.c rijndael.c sha1.c sha2.c softraid.c diff --git a/sys/arch/i386/stand/cdboot/conf.c b/sys/arch/i386/stand/cdboot/conf.c index cf619c5f1a3..71ac4a814c7 100644 --- a/sys/arch/i386/stand/cdboot/conf.c +++ b/sys/arch/i386/stand/cdboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.39 2019/10/29 02:55:51 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.40 2020/03/21 14:54:06 otto Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -31,6 +31,7 @@ #include <netinet/in.h> #include <libsa.h> #include <lib/libsa/ufs.h> +#include <lib/libsa/ufs2.h> #include <lib/libsa/cd9660.h> #ifdef notdef #include <lib/libsa/fat.h> @@ -42,7 +43,7 @@ #include <dev/cons.h> #include "debug.h" -const char version[] = "3.35"; +const char version[] = "3.36"; int debug = 1; void (*sa_cleanup)(void) = NULL; @@ -65,6 +66,8 @@ int nibprobes = nitems(probe_list); 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 }, #ifdef notdef |