e2image.c, e2image.8.in: Add new option -I which allows the

	administrator to install an metadata stored in an e2image
	file to a filesystem.  Obviously, this can be very
	dangerous!

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 38c286c..3a030f2 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-28  Theodore Ts'o  <tytso@mit.edu>
+
+       * e2image.c, e2image.8.in: Add new option -I which allows the
+               administrator to install an metadata stored in an e2image
+               file to a filesystem.  Obviously, this can be very
+               dangerous!
+
 2004-06-25  Theodore Ts'o  <tytso@mit.edu>
 
        * Makefile.in (mke2fs.static): Add the blkid library to so

diff --git a/misc/e2image.8.in b/misc/e2image.8.in
index 500d1f9..3a23d78 100644 (file)
--- a/misc/e2image.8.in
+++ b/misc/e2image.8.in
@@ -8,7 +8,7 @@ e2image \- Save critical ext2/ext3 filesystem data to a file
 .SH SYNOPSIS
 .B e2image
 [
-.B \-r
+.B \-rI
 ]
 .I device
 .I image-file
@@ -46,6 +46,23 @@ pipe.  This restriction will hopefully be lifted in a future version of
 .BR e2image .)
 .PP
 The 
+.B \-I 
+option will cause e2image to install the metadata stored in the image
+file to the device.    It can be used to restore the filesystem metadata
+back to the device in emergency situations.
+.PP
+.B WARNING!!!!
+The
+.B \-I 
+option should only be used as desperation measure when other
+alternatives have failed.  If the filesystem has changed since the image
+file was created, data
+.B will
+be lost.  In general, you should make a full image
+backup of the filesystem first, in case you wish to try other recovery
+strategies afterwards.
+.PP
+The 
 .B \-r
 option will create a raw image file instead of a normal image file.  
 A raw image file differs

diff --git a/misc/e2image.c b/misc/e2image.c
index c6d9dcf..8fecd2d 100644 (file)
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -47,7 +47,7 @@ char * device_name = NULL;
 
 static void usage(void)
 {
-       fprintf(stderr, _("Usage: %s [-r] device file\n"), program_name);
+       fprintf(stderr, _("Usage: %s [-r] device image_file\n"), program_name);
        exit (1);
 }
 
@@ -447,14 +447,83 @@ static void write_raw_image_file(ext2_filsys fs, int fd)
        output_meta_data_blocks(fs, fd);
 }
 
+void install_image(char *device_name, char *image_fn, int raw_flag)
+{
+       int c;
+       errcode_t retval;
+       ext2_filsys fs;
+       int open_flag = EXT2_FLAG_IMAGE_FILE;
+       int fd = 0;
+       io_manager      io_ptr;
+       io_channel      io, image_io;
+
+       if (raw_flag) {
+               com_err(program_name, 0, "Raw images cannot be installed");
+               exit(1);
+       }
+       
+#ifdef CONFIG_TESTIO_DEBUG
+       io_ptr = test_io_manager;
+       test_io_backing_manager = unix_io_manager;
+#else
+       io_ptr = unix_io_manager;
+#endif
+
+       retval = ext2fs_open (image_fn, open_flag, 0, 0,
+                             io_ptr, &fs);
+        if (retval) {
+               com_err (program_name, retval, _("while trying to open %s"),
+                        image_fn);
+               exit(1);
+       }
+
+       retval = ext2fs_read_bitmaps (fs);
+       if (retval) {
+               com_err(program_name, retval, "error reading bitmaps");
+               exit(1);
+       }
+
+
+       fd = open(image_fn, O_RDONLY);
+       if (fd < 0) {
+               perror(image_fn);
+               exit(1);
+       }
+
+       retval = io_ptr->open(device_name, IO_FLAG_RW, &io); 
+       if (retval) {
+               com_err(device_name, 0, "while opening device file");
+               exit(1);
+       }
+
+       image_io = fs->io;
+
+       ext2fs_rewrite_to_io(fs, io);
+
+       if (lseek(fd, fs->image_header->offset_inode, SEEK_SET) < 0) {
+               perror("lseek");
+               exit(1);
+       }
+
+       retval = ext2fs_image_inode_read(fs, fd, 0);
+       if (retval) {
+               com_err(image_fn, 0, "while restoring the image table");
+               exit(1);
+       }
+
+       ext2fs_close (fs);
+       exit (0);
+}
+
 int main (int argc, char ** argv)
 {
        int c;
        errcode_t retval;
        ext2_filsys fs;
-       char *outfn;
+       char *image_fn;
        int open_flag = 0;
        int raw_flag = 0;
+       int install_flag = 0;
        int fd = 0;
 
 #ifdef ENABLE_NLS
@@ -468,18 +537,27 @@ int main (int argc, char ** argv)
        if (argc && *argv)
                program_name = *argv;
        initialize_ext2_error_table();
-       while ((c = getopt (argc, argv, "r")) != EOF)
+       while ((c = getopt (argc, argv, "rI")) != EOF)
                switch (c) {
                case 'r':
                        raw_flag++;
                        break;
+               case 'I':
+                       install_flag++;
+                       break;
                default:
                        usage();
                }
        if (optind != argc - 2 )
                usage();
        device_name = argv[optind];
-       outfn = argv[optind+1];
+       image_fn = argv[optind+1];
+
+       if (install_flag) {
+               install_image(device_name, image_fn, raw_flag);
+               return;
+       }
+
        retval = ext2fs_open (device_name, open_flag, 0, 0,
                              unix_io_manager, &fs);
         if (retval) {
@@ -489,13 +567,13 @@ int main (int argc, char ** argv)
                exit(1);
        }
 
-       if (strcmp(outfn, "-") == 0)
+       if (strcmp(image_fn, "-") == 0)
                fd = 1;
        else {
 #ifdef HAVE_OPEN64
-               fd = open64(outfn, O_CREAT|O_TRUNC|O_WRONLY, 0600);
+               fd = open64(image_fn, O_CREAT|O_TRUNC|O_WRONLY, 0600);
 #else
-               fd = open(outfn, O_CREAT|O_TRUNC|O_WRONLY, 0600);
+               fd = open(image_fn, O_CREAT|O_TRUNC|O_WRONLY, 0600);
 #endif
                if (fd < 0) {
                        com_err(program_name, errno,