From: Eric Biggers <ebiggers@google.com>
To: Theodore Ts'o <tytso@mit.edu>
Cc: fstests@vger.kernel.org, Eric Biggers <ebiggers@google.com>
Subject: [PATCH] kvm-xfstests, gce-xfstests: correct file permissions with --update-files
Date: Tue, 15 Nov 2016 17:40:56 -0800 [thread overview]
Message-ID: <1479260456-6723-1-git-send-email-ebiggers@google.com> (raw)
The xfstests-bld repository may have been cloned with a umask that
masked out the other bits. When using --update-files in this situation,
the VM ended up in a state where non-root users were unable to execute
anything, which made all tests using the fsgqa user get skipped. Fix
this by copying the r and x group bits to the other bits when creating
files.tar.gz. Also set the owner and group to root while we're at it.
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
kvm-xfstests/gce-xfstests | 3 ++-
kvm-xfstests/kvm-xfstests | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/kvm-xfstests/gce-xfstests b/kvm-xfstests/gce-xfstests
index 04eee78..8839ea2 100755
--- a/kvm-xfstests/gce-xfstests
+++ b/kvm-xfstests/gce-xfstests
@@ -471,7 +471,8 @@ then
exit 1
fi
(cd "$DIR/test-appliance"; \
- tar -X gce-exclude-files --exclude=etc -C files -cf - . | \
+ tar -X gce-exclude-files --exclude=etc -C files \
+ --owner=root --group=root --mode=o+g-w -cf - . | \
gzip -9n > $LOCAL_FILES)
get_local_hash "$LOCAL_FILES"
get_remote_hash "$GS_FILES"
diff --git a/kvm-xfstests/kvm-xfstests b/kvm-xfstests/kvm-xfstests
index fbdae7a..bcada9e 100755
--- a/kvm-xfstests/kvm-xfstests
+++ b/kvm-xfstests/kvm-xfstests
@@ -75,7 +75,8 @@ then
exit 1
fi
(cd "$DIR/test-appliance"; \
- tar -X kvm-exclude-files -C files -cf - . | \
+ tar -X kvm-exclude-files -C files \
+ --owner=root --group=root --mode=o+g-w -cf - . | \
gzip -9n > "$TDIR/files.tar.gz")
tar -r -f $VDH -C "$TDIR" files.tar.gz
rm -rf "$TDIR"
--
2.8.0.rc3.226.g39d4020
next reply other threads:[~2016-11-16 1:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-16 1:40 Eric Biggers [this message]
2016-12-09 21:21 ` [PATCH] kvm-xfstests, gce-xfstests: correct file permissions with --update-files Eric Biggers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1479260456-6723-1-git-send-email-ebiggers@google.com \
--to=ebiggers@google.com \
--cc=fstests@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox