daandemeyer / rpms / systemd

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