Message ID | 1479260456-6723-1-git-send-email-ebiggers@google.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, Nov 15, 2016 at 05:40:56PM -0800, Eric Biggers wrote: > 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> Hi Ted, are you planning to apply this patch? I see you applied the patch to fix --update-xfstests-tar but not this one, to fix --update-files. Thanks! Eric -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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"
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(-)