From Cedric Ware <ware@com.enst.fr>:

Detect ext2 partitions in a OpenBSD/NetBSD FS_EXT2FS slice.

diff --git a/ChangeLog b/ChangeLog
index c45c18b8a7c99d413ca843a558f8639e3e025552..7690ef0cde6b7705d16df4a875126f3342d426dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-12-20  Jochen Hoenicke  <jochen@gnu.org>
+
+       From Cedric Ware <ware@com.enst.fr>:
+       * stage2/fsys_ext2.c (ext2fs_mount): Detect ext2 partitions in
+       a OpenBSD/NetBSD FS_EXT2FS slice.
+       * stage2/pc_slice.h (FS_ADOS): New Macro from OpenBSD/NetBSD.
+       (FS_HFS): Likewise.
+       (FS_FILECORE): Likewise.
+       (FS_EXT2FS): Likewise.
+       
 2000-12-17  Jochen Hoenicke  <jochen@gnu.org>
 
        * stage2/disk_io.c (rawread): Check if there is a EZD partition

diff --git a/THANKS b/THANKS
index 0c3eb45d8ff4cf6661a24f35474f0547223dabd6..d38817ee2a779a0e02d2cff3a8b3f0d29151b58c 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -12,6 +12,7 @@ Andrew Clausen <clausen@gnu.org>
 Bradford Hovinen <hovinen@redrose.net>
 Brian Brunswick <brian@skarpsey.demon.co.uk>
 Bryan Ford <baford@cs.utah.edu>
+Cedric Ware <ware@com.enst.fr>
 Chip Salzenberg <chip@valinux.com>
 Christoph Plattner <Christoph.Plattner@dot.at>
 Dan J. Walters <djw@cs.utexas.edu>
@@ -24,6 +25,7 @@ Erik Schoenfelder <schoenfr@gaertner.de>
 Frank Mehnert <fm3@os.inf.tu-dresden.de>
 Goran Koruga <goran.koruga@hermes.si>
 Hal Snyder <hal@vailsys.com>
+Heikki Vatiainen <hessu@cs.tut.fi>
 Heiko Schroeder <heiko@pool.informatik.rwth-aachen.de>
 Herbert Nachtnebel <nachtneb@iaee.tuwien.ac.at>
 Hisazumi Kenji <nel@soraneko.com>
@@ -51,6 +53,7 @@ OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
 Pavel Roskin <pavel_roskin@geocities.com>
 Per Lundberg <plundis@byggdok.se>
 Peter Astrand <altic@lysator.liu.se>
+Ralf Medow <ralf.medow@t-online.de>
 Ramon van Handel <vhandel@chem.vu.nl>
 Roderich Schupp <rsch@ExperTeam.de>
 Stefan Ondrejicka <ondrej@idata.sk>

diff --git a/stage2/fsys_ext2fs.c b/stage2/fsys_ext2fs.c
index 5c39532d97b587cf83d02f0e2a5405f29af6e64a..d06f94128eadb50150a76e29bb9fc0c7da336bd5 100644 (file)
--- a/stage2/fsys_ext2fs.c
+++ b/stage2/fsys_ext2fs.c
@@ -257,6 +257,7 @@ ext2fs_mount (void)
 
   if ((((current_drive & 0x80) || (current_slice != 0))
        && (current_slice != PC_SLICE_TYPE_EXT2FS)
+       && (! IS_PC_SLICE_TYPE_BSD_WITH_FS (current_slice, FS_EXT2FS))
        && (! IS_PC_SLICE_TYPE_BSD_WITH_FS (current_slice, FS_OTHER)))
       || part_length < (SBLOCK + (sizeof (struct ext2_super_block) / DEV_BSIZE))
       || !devread (SBLOCK, 0, sizeof (struct ext2_super_block),

diff --git a/stage2/pc_slice.h b/stage2/pc_slice.h
index e091047054c15956866cc7a213aa156aaa170030..73cfb5eba65c13ac2170054a557a512894a70d2e 100644 (file)
--- a/stage2/pc_slice.h
+++ b/stage2/pc_slice.h
@@ -238,6 +238,10 @@
 #define        FS_HPFS         11      /* OS/2 high-performance file system */
 #define        FS_ISO9660      12      /* ISO 9660, normally CD-ROM */
 #define        FS_BOOT         13      /* partition contains bootstrap */
+#define        FS_ADOS         14      /* AmigaDOS fast file system */
+#define        FS_HFS          15      /* Macintosh HFS */
+#define        FS_FILECORE     16      /* Acorn Filecore Filing System */
+#define        FS_EXT2FS       17      /* Linux Extended 2 file system */
 
 
 #endif /* _PC_SLICE_H */