support cd9660 filesystem, too

2 files changed, 13 insertions, 3 deletions

diff --git a/sys/arch/sparc/stand/conf.c b/sys/arch/sparc/stand/conf.c
index b03b9998977..4ff1e21696b 100644
--- a/sys/arch/sparc/stand/conf.c
+++ b/sys/arch/sparc/stand/conf.c
@@ -34,13 +34,19 @@
 #include <stand.h>
 #include <ufs.h>
 #include <netinet/in.h>
+#include <cd9660.h>
 #include <nfs.h>
  
 struct fs_ops file_system_ufs[] = {
 	{ ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat },
 };
+struct fs_ops file_system_cd9660[] = {
+	{ cd9660_open, cd9660_close, cd9660_read, cd9660_write, cd9660_seek,
+	  cd9660_stat },
+};
 struct fs_ops file_system_nfs[] = {
 	{ nfs_open, nfs_close, nfs_read, nfs_write, nfs_seek, nfs_stat },
 };
-struct fs_ops file_system[1];
-int nfsys = sizeof(file_system)/sizeof(struct fs_ops);
+struct fs_ops file_system[2];
+int nfsys = 1;
+
diff --git a/sys/arch/sparc/stand/promdev.c b/sys/arch/sparc/stand/promdev.c
index 48a51cb9c12..1d244b82682 100644
--- a/sys/arch/sparc/stand/promdev.c
+++ b/sys/arch/sparc/stand/promdev.c
@@ -68,6 +68,7 @@ char	*getpropstring __P((int, char *));
 static void	prom0_fake __P((void));
 
 extern struct filesystem file_system_nfs[];
+extern struct filesystem file_system_cd9660[];
 extern struct filesystem file_system_ufs[];
 
 int prom_open __P((struct open_file *f, ...)) { return 0; }
@@ -198,8 +199,11 @@ devopen(f, fname, file)
 				prom_bootdevice);
 			return error;
 		}
-	} else
+	} else {
 		bcopy(file_system_ufs, file_system, sizeof(struct fs_ops));
+		bcopy(&file_system_cd9660, file_system + 1, sizeof file_system[0]);
+		nfsys = 2;
+	}
 #endif /* BOOTXX */
 
 	f->f_dev = &devsw[cputyp == CPU_SUN4 ? 0 : 1];