From f704f15c0b6d2c5855185357611de81e0474cfbb Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 6 Jan 2003 18:32:24 +0000
Subject: (mount): do not fsck.ext2 when mounting readonly

---
 perl-install/fs.pm | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'perl-install/fs.pm')

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 42c0a9bee..be5d5c889 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -696,15 +696,19 @@ sub mount {
 		die "fsck.jfs failed" if $err & 0xfc00;
 	    };
 	} elsif ($fs eq 'ext2' || $fs eq 'ext3' && $::isInstall) {
-	    foreach ('-a', '-y') {
-		run_program::raw({ timeout => 60 * 60 }, "fsck.ext2", $_, $dev);
-		my $err = $?;
-		if ($err & 0x0100) { log::l("fsck corrected partition $dev") }
-		if ($err & 0xfeff) {
-		    my $txt = sprintf("fsck failed on %s with exit code %d or signal %d", $dev, $err >> 8, $err & 255);
-		    $_ eq '-y' ? die($txt) : cdie($txt);
-		} else {
-		    last;
+	    if (!$rdonly) {
+		foreach ('-a', '-y') {
+		    run_program::raw({ timeout => 60 * 60 }, "fsck.ext2", $_, $dev);
+		    my $err = $?;
+		    if ($err & 0x0100) {
+			log::l("fsck corrected partition $dev");
+		    }
+		    if ($err & 0xfeff) {
+			my $txt = sprintf("fsck failed on %s with exit code %d or signal %d", $dev, $err >> 8, $err & 255);
+			$_ eq '-y' ? die($txt) : cdie($txt);
+		    } else {
+			last;
+		    }
 		}
 	    }
 	    # really mount as ext2 during install for speed up
-- 
cgit v1.2.1