daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
dd65c9
From e82e71d82496b7dd3268db62a89f215b4b38508f Mon Sep 17 00:00:00 2001
dd65c9
From: Michal Sekletar <msekleta@redhat.com>
dd65c9
Date: Mon, 24 Jul 2017 18:47:36 +0200
dd65c9
Subject: [PATCH] tests: use XFS as root filesystem for system tests
dd65c9
dd65c9
On RHEL-7 we don't have mount.ext3 in initramfs.
dd65c9
dd65c9
RHEL-only
dd65c9
dd65c9
Resolves: #1475870
dd65c9
---
dd65c9
 test/TEST-02-CRYPTSETUP/test.sh | 4 ++--
dd65c9
 test/test-functions             | 2 +-
dd65c9
 2 files changed, 3 insertions(+), 3 deletions(-)
dd65c9
dd65c9
diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh
dd65c9
index 4be2365e2..6e5c53d8b 100755
dd65c9
--- a/test/TEST-02-CRYPTSETUP/test.sh
dd65c9
+++ b/test/TEST-02-CRYPTSETUP/test.sh
dd65c9
@@ -38,7 +38,7 @@ test_setup() {
dd65c9
     echo -n test >$TESTDIR/keyfile
dd65c9
     cryptsetup -q luksFormat ${LOOPDEV}p2 $TESTDIR/keyfile
dd65c9
     cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile
dd65c9
-    mkfs.ext3 -L var /dev/mapper/varcrypt
dd65c9
+    mkfs.xfs -L var /dev/mapper/varcrypt
dd65c9
     mkdir -p $TESTDIR/root
dd65c9
     mount ${LOOPDEV}p1 $TESTDIR/root
dd65c9
     mkdir -p $TESTDIR/root/var
dd65c9
@@ -74,7 +74,7 @@ EOF
dd65c9
         cat $initdir/etc/crypttab | ddebug
dd65c9
 
dd65c9
         cat >>$initdir/etc/fstab <
dd65c9
-/dev/mapper/varcrypt    /var    ext3    defaults 0 1
dd65c9
+/dev/mapper/varcrypt    /var    xfs    defaults 0 1
dd65c9
 EOF
dd65c9
     )
dd65c9
     setup_nspawn_root
dd65c9
diff --git a/test/test-functions b/test/test-functions
dd65c9
index 901ff4860..f8950e31e 100644
dd65c9
--- a/test/test-functions
dd65c9
+++ b/test/test-functions
dd65c9
@@ -150,7 +150,7 @@ create_empty_image() {
dd65c9
 ,
dd65c9
 EOF
dd65c9
 
dd65c9
-    mkfs.ext3 -L systemd "${LOOPDEV}p1"
dd65c9
+    mkfs.xfs -L systemd "${LOOPDEV}p1"
dd65c9
 }
dd65c9
 
dd65c9
 check_result_nspawn() {