ChangeLog, dumpe2fs.8.in, dumpe2fs.c:

  dumpe2fs.c (main): Add new flag, -i, which will allow dumpe2fs to dump
  	out the filesystem statistics from an ext2 image file.
Many files:
  e2image.8.in: New manual page
  badblocks.8.in, e2label.8.in, mke2fs.8.in mklost+found.8.in,
  	tune2fs.8.in: Update location of e2fsprogs to be
  	http://e2fsprogs.sourceforge.net.

diff --git a/misc/ChangeLog b/misc/ChangeLog
index e13655f..1d693fe 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,5 +1,15 @@
 2001-05-03  Theodore Tso  <tytso@valinux.com>
 
+       * e2image.8.in: New manual page
+
+       * badblocks.8.in, e2label.8.in, mke2fs.8.in mklost+found.8.in, 
+               tune2fs.8.in: Update location of e2fsprogs to be
+               http://e2fsprogs.sourceforge.net.
+
+       * dumpe2fs.c (main): Add new flag, -i, which will allow dumpe2fs
+               to dump out the filesystem statistics from an ext2 image
+               file.
+       
        * e2image.c (main): Fix format of e2image to be easier to be parse
                by ext2fs_open().
 

diff --git a/misc/Makefile.in b/misc/Makefile.in
index e4ba126..2d5a587 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -14,7 +14,7 @@ INSTALL = @INSTALL@
 SPROGS=                mke2fs badblocks tune2fs dumpe2fs e2image @FSCK_PROG@
 USPROGS=       mklost+found
 SMANPAGES=     tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
-                       e2label.8 @FSCK_MAN@
+                       e2label.8 e2image.8 @FSCK_MAN@
 
 UPROGS=                chattr lsattr uuidgen
 UMANPAGES=     chattr.1 lsattr.1 uuidgen.1
@@ -108,6 +108,9 @@ mke2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.8.in
 e2label.8: $(DEP_SUBSTITUTE) $(srcdir)/e2label.8.in
        $(SUBSTITUTE) $(srcdir)/e2label.8.in e2label.8
 
+e2image.8: $(DEP_SUBSTITUTE) $(srcdir)/e2image.8.in
+       $(SUBSTITUTE) $(srcdir)/e2image.8.in e2image.8
+
 dumpe2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/dumpe2fs.8.in 
        $(SUBSTITUTE) $(srcdir)/dumpe2fs.8.in dumpe2fs.8
 

diff --git a/misc/badblocks.8.in b/misc/badblocks.8.in
index ed858a8..4bb1ac4 100644 (file)
--- a/misc/badblocks.8.in
+++ b/misc/badblocks.8.in
@@ -145,8 +145,8 @@ Theodore Ts'o <tytso@alum.mit.edu>.  Non-destructive read/write test
 implemented by David Beattie <dbeattie@softhome.net>.
 .SH AVAILABILITY
 .B badblocks
-is part of the e2fsprogs package and is available for anonymous 
-ftp from tsx-11.mit.edu in /pub/linux/packages/ext2fs.
+is part of the e2fsprogs package and is available from anonymous 
+http://e2fsprogs.sourceforge.net.
 .SH SEE ALSO
 .BR e2fsck (8),
 .BR mke2fs (8)

diff --git a/misc/dumpe2fs.8.in b/misc/dumpe2fs.8.in
index 7ded366..fb27d63 100644 (file)
--- a/misc/dumpe2fs.8.in
+++ b/misc/dumpe2fs.8.in
@@ -8,7 +8,7 @@ dumpe2fs \- dump filesystem information
 .SH SYNOPSIS
 .B dumpe2fs
 [
-.B \-bfhxV
+.B \-bfhixV
 ]
 [
 .B \-ob 
@@ -57,6 +57,13 @@ can cause some of dumpe2fs's display to be suspect).
 only display the superblock information and not any of the block
 group descriptor detail information.
 .TP
+.B \-i
+display the filesystem data from an image file created by 
+.BR e2image ,
+using 
+.I device
+as the pathname to the image file.
+.TP
 .B \-x
 print the detailed group information block numbers in hexadecimal format
 .TP
@@ -72,9 +79,10 @@ output.
 was written by Remy Card <Remy.Card@linux.org>.
 .SH AVAILABILITY
 .B dumpe2fs
-is part of the e2fsprogs package and is available for anonymous 
-ftp from tsx-11.mit.edu in /pub/linux/packages/ext2fs.
+is part of the e2fsprogs package and is available from anonymous 
+http://e2fsprogs.sourceforge.net.
 .SH SEE ALSO
 .BR e2fsck (8),
 .BR mke2fs (8),
 .BR tune2fs (8)
+

diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c
index bb1cbc1..f9b2ad4 100644 (file)
--- a/misc/dumpe2fs.c
+++ b/misc/dumpe2fs.c
@@ -49,7 +49,7 @@ int opt_hex = 0;
 
 static void usage(void)
 {
-       fprintf (stderr, _("Usage: %s [-bfhxV] [-ob superblock] "
+       fprintf (stderr, _("Usage: %s [-bfhixV] [-ob superblock] "
                 "[-oB blocksize] device\n"), program_name);
        exit (1);
 }
@@ -255,6 +255,7 @@ int main (int argc, char ** argv)
        int             print_badblocks = 0;
        int             use_superblock = 0;
        int             use_blocksize = 0;
+       int             image_dump = 0;
        int             force = 0;
        int             flags;
        int             header_only = 0;
@@ -273,7 +274,7 @@ int main (int argc, char ** argv)
        if (argc && *argv)
                program_name = *argv;
        
-       while ((c = getopt (argc, argv, "bfhxVo:")) != EOF) {
+       while ((c = getopt (argc, argv, "bfhixVo:")) != EOF) {
                switch (c) {
                case 'b':
                        print_badblocks++;
@@ -284,6 +285,9 @@ int main (int argc, char ** argv)
                case 'h':
                        header_only++;
                        break;
+               case 'i':
+                       image_dump++;
+                       break;
                case 'o':
                        if (optarg[0] == 'b')
                                use_superblock = atoi(optarg+1);
@@ -312,6 +316,9 @@ int main (int argc, char ** argv)
        flags = EXT2_FLAG_JOURNAL_DEV_OK;
        if (force)
                flags |= EXT2_FLAG_FORCE;
+       if (image_dump)
+               flags |= EXT2_FLAG_IMAGE_FILE;
+       
        retval = ext2fs_open (device_name, flags, use_superblock,
                              use_blocksize, unix_io_manager, &fs);
        if (retval) {

diff --git a/misc/e2image.8.in b/misc/e2image.8.in
new file mode 100644 (file)
index 0000000..e9688c8
--- /dev/null
+++ b/misc/e2image.8.in
@@ -0,0 +1,29 @@
+.\" -*- nroff -*-
+.\" Copyright 2001 by Theodore Ts'o.  All Rights Reserved.
+.\" This file may be copied under the terms of the GNU Public License.
+.\" 
+.TH E2IMAGE 8 "@E2FSPROGS_MONTH@ @E2FSPROGS_YEAR@" "E2fsprogs version @E2FSPROGS_VERSION@"
+.SH NAME
+e2image \- Save critical ext2 filesystem data to a file
+.SH SYNOPSIS
+.B e2image
+.I device
+.I image-file
+.SH DESCRIPTION
+.B e2image
+will save critical filesystem data on the ext2 filesystem located on 
+display or change the filesystem label on the ext2 filesystem located on
+.I device
+to a file.
+.PP
+.SH AUTHOR
+.B e2label 
+was written by Theodore Ts'o (tytso@mit.edu).
+.SH AVAILABILITY
+.B e2image
+is part of the e2fsprogs package and is available from anonymous 
+http://e2fsprogs.sourceforge.net.
+.SH SEE ALSO
+.BR dumpe2fs (8),
+.BR debugfs (8)
+

diff --git a/misc/e2label.8.in b/misc/e2label.8.in
index 2153b33..3152d41 100644 (file)
--- a/misc/e2label.8.in
+++ b/misc/e2label.8.in
@@ -41,11 +41,11 @@ option of
 .PP
 .SH AUTHOR
 .B e2label 
-was written by Andries Brouwer (aeb@cwi.nl).
+was written by Theodore Ts'o (tytso@mit.edu).
 .SH AVAILABILITY
 .B e2label
-is part of the e2fsprogs package and is available for anonymous 
-ftp from tsx-11.mit.edu in /pub/linux/packages/ext2fs.
+is part of the e2fsprogs package and is available from anonymous 
+http://e2fsprogs.sourceforge.net.
 .SH SEE ALSO
 .BR mke2fs (8),
 .BR tune2fs (8)

diff --git a/misc/mke2fs.8.in b/misc/mke2fs.8.in
index 9be1429..e9f4451 100644 (file)
--- a/misc/mke2fs.8.in
+++ b/misc/mke2fs.8.in
@@ -354,8 +354,8 @@ extended file system does not support fragments yet.
 There may be other ones.  Please, report them to the author.
 .SH AVAILABILITY
 .B mke2fs
-is part of the e2fsprogs package and is available for anonymous 
-ftp from tsx-11.mit.edu in /pub/linux/packages/ext2fs.
+is part of the e2fsprogs package and is available from anonymous 
+http://e2fsprogs.sourceforge.net.
 .SH SEE ALSO
 .BR badblocks (8),
 .BR dumpe2fs (8),

diff --git a/misc/mklost+found.8.in b/misc/mklost+found.8.in
index e5609de..954e0a5 100644 (file)
--- a/misc/mklost+found.8.in
+++ b/misc/mklost+found.8.in
@@ -35,8 +35,8 @@ has been written by Remy Card <Remy.Card@linux.org>.
 There are none :-)
 .SH AVAILABILITY
 .B mklost+found
-is part of the e2fsprogs package and is available for anonymous 
-ftp from tsx-11.mit.edu in /pub/linux/packages/ext2fs.
+is part of the e2fsprogs package and is available from anonymous 
+http://e2fsprogs.sourceforge.net.
 .SH SEE ALSO
 .BR e2fsck (8),
 .BR mke2fs (8)

diff --git a/misc/tune2fs.8.in b/misc/tune2fs.8.in
index 4a96c4b..87a8249 100644 (file)
--- a/misc/tune2fs.8.in
+++ b/misc/tune2fs.8.in
@@ -274,8 +274,8 @@ This manual page was written by Christian Kuhtz <chk@data-hh.Hanse.DE>.
 Timedependent checking was added by Uwe Ohse <uwe@tirka.gun.de>.
 .SH AVAILABILITY
 .B tune2fs
-is part of the e2fsprogs package and is available for anonymous 
-ftp from tsx-11.mit.edu in /pub/linux/packages/ext2fs.
+is part of the e2fsprogs package and is available from anonymous 
+http://e2fsprogs.sourceforge.net.
 .SH SEE ALSO
 .BR dumpe2fs (8),
 .BR e2fsck (8),