From: Eric Biggers <ebiggers3@gmail.com>
To: Theodore Ts'o <tytso@mit.edu>
Cc: fstests@vger.kernel.org, Eric Biggers <ebiggers@google.com>
Subject: [PATCH] [xfstests-bld] test-appliance: yet another file permissions fix
Date: Tue, 28 Feb 2017 12:46:43 -0800 [thread overview]
Message-ID: <20170228204643.37016-1-ebiggers3@gmail.com> (raw)
From: Eric Biggers <ebiggers@google.com>
Several directories in the kvm-xfstests appliance were still not being
given the correct file permissions, since they were rsync'ed directly
into the mounted root filesystem with the '-a' option. Unfortunately it
seems we can't express "go+u-w" with rsync options (it's not accepted by
--chmod), but we can copy the files through 'tar' instead, similar to
what is done elsewhere.
(I didn't notice this earlier because it is kvm-xfstests specific, and
it only broke a couple tests such as generic/128.)
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
kvm-xfstests/test-appliance/gen-image | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kvm-xfstests/test-appliance/gen-image b/kvm-xfstests/test-appliance/gen-image
index 67f8c6b..dbd9b84 100755
--- a/kvm-xfstests/test-appliance/gen-image
+++ b/kvm-xfstests/test-appliance/gen-image
@@ -111,7 +111,8 @@ fi
update_xfstests()
{
tar -C $ROOTDIR/root -xf ../../xfstests.tar.gz
- rsync --exclude-from kvm-exclude-files -avH files/* $ROOTDIR
+ tar -X kvm-exclude-files -C files \
+ --owner=root --group=root --mode=go+u-w -c . | tar -C $ROOTDIR -x
rsync -avH ../../xfstests/git-versions $ROOTDIR/root/xfstests
chown -R root:root $ROOTDIR/root
chmod -R go+u-w $ROOTDIR/root
--
2.11.0.483.g087da7b7c-goog
next reply other threads:[~2017-02-28 20:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-28 20:46 Eric Biggers [this message]
2017-03-01 19:42 ` [PATCH] [xfstests-bld] test-appliance: yet another file permissions fix Theodore Ts'o
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=20170228204643.37016-1-ebiggers3@gmail.com \
--to=ebiggers3@gmail.com \
--cc=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.