common/rc: improve _require_metadata_journaling() for ext4

The code in _require_metadata_journaling() currently rejects ext4
file systems that have been created without a journal.  However, an
ext4 file system with a journal should also be rejected if the
journal is not loaded and made available for use at mount time.

Signed-off-by: Eric Whitney <enwlinux@gmail.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/common/rc b/common/rc
index e6831b502d11ad7417fa0cf958befd33b47f5dd9..4a30fb3699a28453b59f8fdccd8fa737ab26080e 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -3057,6 +3057,8 @@ _require_metadata_journaling()
                _require_dumpe2fs
                $DUMPE2FS_PROG -h $DEV 2>&1 | grep -q has_journal || \
                        _notrun "$FSTYP on $DEV not configured with metadata journaling"
+               # ext4 might not load a journal
+               _exclude_scratch_mount_option "noload"
                ;;
        *)
                # by default we pass; if you need to, add your fs above!