From patchwork Tue Feb 28 20:46:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9596787 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 45A5660429 for ; Tue, 28 Feb 2017 20:56:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3835D2857C for ; Tue, 28 Feb 2017 20:56:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C84528583; Tue, 28 Feb 2017 20:56:12 +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, FREEMAIL_FROM, 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 CD4612857C for ; Tue, 28 Feb 2017 20:56:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751828AbdB1Uzm (ORCPT ); Tue, 28 Feb 2017 15:55:42 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:33601 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752020AbdB1Uz1 (ORCPT ); Tue, 28 Feb 2017 15:55:27 -0500 Received: by mail-pg0-f67.google.com with SMTP id x17so2923260pgi.0 for ; Tue, 28 Feb 2017 12:54:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Q24J8+swutFCrCjGUgM72aP8/GT7ohFFig9bbR9R37o=; b=PidD3VW7vGNnOoFawC0MbgpGZApvfE/fhY2bqZoZN+n1w7aIbHdOmKQ/Rwiqc80pem NW+e+mFmzmRSd0BfTT+fwZ9JXKAT3ZohU+WmH6d74YaZVwkqECejUZR8tt6LEmxMF7JD OslgPnVp7vq1yWi2Cp0JOD3SrTXwAF/J+U1QI03uEM/0+d3JqzopklrwylwxnBBTV0Xx TfZEpQTKGoOC0RKDb/pv1YYJOdhMTfkjSwWKbpA2jlCNx8dv8xI1zGJO9cPiKYVJKERp i68W8eLWZKp+r/zITLLe9zD8RupZ4UQiEwk/iMDlZkRqzlCKOjG3K1mrIqxg9juoKaqC V4ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Q24J8+swutFCrCjGUgM72aP8/GT7ohFFig9bbR9R37o=; b=H5XrehnKmyhlmUu5snTZJRhqjxPJ5B9Nr+FOt5+jBwGgVXKYXgCZbq5LDXKWO1+ZKk rPsJ+D90fjmHSsiCHDBO5YFWWc0cfQtFSrF3prh32xJJyXT292lavDQjPfAdyuBT+rm/ +uDOsK1u5USpgQWJEFK3IF+VdjpbveBvnnx4WHcySy6nIM5QRu9dCnih8yB8+iJcdj41 dr6YSmsaVPJM9fFY7vi/QAIkNYr2axh01uwZ8ddNT1lHMv+mTIuo5e9zUm0Www84HcIQ ofSfbYfu8rkSFeIJe0wlb1An8zMqUagMFMw2jX90KxvZsQqhDX5LzDEGKuc2sWsIXto5 0DPA== X-Gm-Message-State: AMke39l4KcV6jqcccCTdYgHveHP0BNN73CXRT5etDUWPCGE5QUJVCAOHgmIOU6Ngcqo57A== X-Received: by 10.99.232.5 with SMTP id s5mr4722070pgh.66.1488314868647; Tue, 28 Feb 2017 12:47:48 -0800 (PST) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.119.30.131]) by smtp.gmail.com with ESMTPSA id j7sm5912549pfe.84.2017.02.28.12.47.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Feb 2017 12:47:47 -0800 (PST) From: Eric Biggers To: Theodore Ts'o Cc: fstests@vger.kernel.org, Eric Biggers Subject: [PATCH] [xfstests-bld] test-appliance: yet another file permissions fix Date: Tue, 28 Feb 2017 12:46:43 -0800 Message-Id: <20170228204643.37016-1-ebiggers3@gmail.com> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers 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 --- 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