ChangeLog, unix.c:

  unix.c (main): If we're doing a read-only check, skip the journal
  	playback, but don't abort the e2fsck run.

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index de93ab1de14722e441499ee5c33e02ca34569210..7fd1f7a237a2146f9cdaa57840cf092c6419622f 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-22    <tytso@valinux.com>
 
+       * unix.c (main): If we're doing a read-only check, skip the
+               journal playback, but don't abort the e2fsck run.
+
        * super.c (release_orphan_inodes): Fix typo; should do bounds
                checking on next_ino instead of ino.
 

diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 1a258316c89874df4a3d9eda377346f97b576cf5..29e13f549e476140f0dd55c13c86921da0b5beb5 100644 (file)
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -808,16 +808,23 @@ restart:
        }
 
        if (s->s_feature_incompat & EXT3_FEATURE_INCOMPAT_RECOVER) {
-               retval = e2fsck_run_ext3_journal(ctx);
-               if (retval) {
-                       com_err(ctx->program_name, retval,
+               if (ctx->options & E2F_OPT_READONLY) {
+                       printf(_("Warning: skipping journal recovery "
+                                "because doing a read-only filesystem "
+                                "check.\n"));
+                       io_channel_flush(ctx->fs->io);
+               } else {
+                       retval = e2fsck_run_ext3_journal(ctx);
+                       if (retval) {
+                               com_err(ctx->program_name, retval,
                                _("while recovering ext3 journal of %s"),
-                               ctx->device_name);
-                       fatal_error(ctx, 0);
+                                       ctx->device_name);
+                               fatal_error(ctx, 0);
+                       }
+                       ext2fs_close(ctx->fs);
+                       ctx->fs = 0;
+                       goto restart;
                }
-               ext2fs_close(ctx->fs);
-               ctx->fs = 0;
-               goto restart;
        }
 
        /*