From patchwork Wed Nov 16 01:40:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9430779 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8DB9360484 for ; Wed, 16 Nov 2016 01:41:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E3E52873A for ; Wed, 16 Nov 2016 01:41:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 701DF28D24; Wed, 16 Nov 2016 01:41:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD8672873A for ; Wed, 16 Nov 2016 01:41:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752632AbcKPBln (ORCPT ); Tue, 15 Nov 2016 20:41:43 -0500 Received: from mail-pf0-f179.google.com ([209.85.192.179]:36837 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752445AbcKPBlm (ORCPT ); Tue, 15 Nov 2016 20:41:42 -0500 Received: by mail-pf0-f179.google.com with SMTP id 189so39354507pfz.3 for ; Tue, 15 Nov 2016 17:41:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=u7iWe43szC35IGP8lmvzz6xfFTs9jSLLApJpkJspjCk=; b=EQscc0N5eMj3esy0pfyRooCLXmtzOk8GLrP04XNC9QEE+GNJcRE+Ya0AQgQagui01B 8frfs/vP7GPWAxC9HmA2XmIcsanczZkLH+XJgs3Nxl+DzHq2TKUYK9gdNB3AqBWq3em2 0HBHjqtGixrxkPaR8dZ7UUQYgcQ1jzBSLDL3fyziPod0OA9bAnC4keGQKi6lEw9VReDR 4/y9e5I8Ybk0oIzhNjVvqSz1zO8YlXl/yU7B4oVbcy0Vt79eWKWQYcedsBh0aAi79GP7 5yvRvaFUyQ3msTGXbb35IZMd1jolxSDmC0uzuIeXklyazQ6YL6cPKbTAJk/gU7K2fher F9bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=u7iWe43szC35IGP8lmvzz6xfFTs9jSLLApJpkJspjCk=; b=dOPCZ0Swn5PWw82taCItMvBiczsdZj8no4ovvMU46iKDLkDbrpEkS2SlkviPI2N3wV IZK1jyeRBObRJWVp7PdJWdM6ecKjWQgJu9whs0QNZGKmfOzZwEnQXXrtzmzEFBsEriFu PR2xUmyouQ78dEWszoy0qZrvCsPU0uJLUxWmFyeFr0YmJVxi4Z420SunIk2lrg/cwe/l 1gyhUTZMkAhqgDUGA8U8kFX4dBxfqPNE85WqQDXcKUfm0TNTJE/FnJxkApju44nYYmZl 8ueNIB+cQ4G7OLGyMzFYJj906Y46oYk3TPdGA+x0diVtJnijDpxddzgdhc25NQTE7Tbi Qm+g== X-Gm-Message-State: ABUngvcgdV4MTMz6FHEcA0FxI7zvEJxRREt95Rq9rnOzMZYOp+SzROu27xATQqZB0sBSAzXr X-Received: by 10.99.212.69 with SMTP id i5mr2494194pgj.39.1479260501813; Tue, 15 Nov 2016 17:41:41 -0800 (PST) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.119.30.154]) by smtp.gmail.com with ESMTPSA id p68sm46968098pfd.11.2016.11.15.17.41.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Nov 2016 17:41:40 -0800 (PST) From: Eric Biggers To: Theodore Ts'o Cc: fstests@vger.kernel.org, Eric Biggers Subject: [PATCH] kvm-xfstests, gce-xfstests: correct file permissions with --update-files Date: Tue, 15 Nov 2016 17:40:56 -0800 Message-Id: <1479260456-6723-1-git-send-email-ebiggers@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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"