From c3a63503350ecfca2f38c506feb1a9e3c8e3aa30 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Tue, 9 Feb 2021 18:02:13 +0100
Subject: [PATCH] tests: be explicit with file permissions for cramfs

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 tests/ts/cramfs/mkfs            | 10 ++++++++--
 tests/ts/cramfs/mkfs-endianness |  6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/tests/ts/cramfs/mkfs b/tests/ts/cramfs/mkfs
index 19651767c..90630ebf7 100755
--- a/tests/ts/cramfs/mkfs
+++ b/tests/ts/cramfs/mkfs
@@ -24,6 +24,7 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_MKCRAMFS"
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
+ts_check_test_command "$TS_CMD_BLKID"
 ts_check_test_command "$TS_HELPER_MD5"
 ts_check_test_command "$TS_HELPER_SYSINFO"
 
@@ -58,16 +59,21 @@ ts_log "create mountpoint dir"
 
 ts_log "generate data"
 rm -rf "$IMAGE_SRC"
-mkdir -p $IMAGE_SRC
+mkdir -m 755 -p $IMAGE_SRC
+
+umask 133
+
 for d in `seq 0 110`; do
 	DIRNAME="$IMAGE_SRC/$(printf "dir-%03d" $d)"
-	mkdir -p $DIRNAME
+	mkdir -m 755 $DIRNAME
 	for f in `seq 0 10`; do
 		FILENAME="$DIRNAME/$(printf "data.%03d" $f)"
 		printf "data in %03d-%03d" $d $f >> $FILENAME
 	done
 done
 
+chgrp -R 0 "$IMAGE_SRC"
+
 ts_cd "$IMAGE_SRC"
 
 ts_log "list checksums from original data"
diff --git a/tests/ts/cramfs/mkfs-endianness b/tests/ts/cramfs/mkfs-endianness
index 02f69495f..91d476579 100755
--- a/tests/ts/cramfs/mkfs-endianness
+++ b/tests/ts/cramfs/mkfs-endianness
@@ -29,6 +29,8 @@ ts_skip_nonroot
 IMAGE_DATA="$TS_OUTDIR/${TS_TESTNAME}-data"
 IMAGE_CREATED="$TS_OUTDIR/${TS_TESTNAME}-cramfs.img"	#Image created during the test and compared against the known images.
 
+umask 133
+
 test_image() {
 	local TO_ENDIANNESS="$1"; shift
 	ts_log "create $TO_ENDIANNESS endian"
@@ -43,7 +45,9 @@ test_image() {
 
 #generate test data, must be owner root
 rm -rf "$IMAGE_DATA"
-mkdir -p $IMAGE_DATA/dirA/dirB
+mkdir -m 755 $IMAGE_DATA
+mkdir -m 755 $IMAGE_DATA/dirA
+mkdir -m 755 $IMAGE_DATA/dirA/dirB
 
 cp $TS_SELF/mkfs-endianness_testdata_a $IMAGE_DATA/dirA/dirB/a
 cp $TS_SELF/mkfs-endianness_testdata_b $IMAGE_DATA/dirA/dirB/b