From nobody Sun Feb 8 23:06:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606906076; cv=none; d=zohomail.com; s=zohoarc; b=BvlZqPKool8bfZTqH6CDuRoUMYadh7hgeQIiYy8ETGHBhtDVWBJ92YsxwOxEzT42WP/gJqUGDHWmZXS2dKMpBqBO1TKk8hMBvsPDaRAfCU3tiNAS/c6NyThVHhMrkEb5o8LCXd07dU9MTt+/P5kvjC72cyjZsHDh9y2gglQYaPQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606906076; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J8Uk9K7Pv+NXIsNY6f5UFAOgjqzn0Un7X7C2+Pz6kp4=; b=Y0qgpo1Oqkqx9p0swyWLhCO2Z8CgCblRGkTvd9HMpiRXXCGe3c+UXFLoZkzqrpaDSY/HHoaRONTcHmhUggmhiEGMMxkV6VHCIMQzJgIn7S4U4ME9DC1a2PKXAEejQ7frnrZ69kFNVjHg6inKg6h1Hz8zU/dRuQ6aYMCh11tpjek= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 160690607678576.9964917057033; Wed, 2 Dec 2020 02:47:56 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-583-SGb3LWRGP-mw8-1Gl4kk-Q-1; Wed, 02 Dec 2020 05:47:52 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9AB3A1007B05; Wed, 2 Dec 2020 10:47:46 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 746715D6AC; Wed, 2 Dec 2020 10:47:46 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 072F2180954D; Wed, 2 Dec 2020 10:47:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0B2AhKGP013810 for ; Wed, 2 Dec 2020 05:43:20 -0500 Received: by smtp.corp.redhat.com (Postfix) id A5C8119D9F; Wed, 2 Dec 2020 10:43:20 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 05D8919C48 for ; Wed, 2 Dec 2020 10:43:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606906075; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=J8Uk9K7Pv+NXIsNY6f5UFAOgjqzn0Un7X7C2+Pz6kp4=; b=hMrj6IBW673z7184y26FXXudx15c9yH5rLSGbm+gnR1RNXtWMR2YJ9QfGYuigS9HCg3yY+ tfDCtGWwFpmrgwRUiu+KhN4IKcwrJT59eZPEzLNbe/qDd0qmwg3VSqTWBXJoO9V6MwhEe/ q/7hvd6cHNl/WyI9464FXEqLMCl0JIo= X-MC-Unique: SGb3LWRGP-mw8-1Gl4kk-Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/4] libvirt_recover_xattrs: Allow fixing multiple PATHs Date: Wed, 2 Dec 2020 11:43:11 +0100 Message-Id: <61d9e7c1fa3321586d97d1171659df4c10b64a5d.1606905624.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Loop for multiple PATH arguments to support shell pattern expansion. Signed-off-by: Peter Krempa --- tools/libvirt_recover_xattrs.sh | 51 +++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/tools/libvirt_recover_xattrs.sh b/tools/libvirt_recover_xattrs= .sh index bb5f23cff0..59f1f3f476 100755 --- a/tools/libvirt_recover_xattrs.sh +++ b/tools/libvirt_recover_xattrs.sh @@ -7,7 +7,7 @@ function die { function show_help { cat << EOF -Usage: ${0##*/} -[hqnu] [PATH] +Usage: ${0##*/} -[hqnu] [PATH ...] Clear out any XATTRs set by libvirt on all files that have them. The idea is to reset refcounting, should it break. @@ -25,7 +25,6 @@ EOF QUIET=3D0 DRY_RUN=3D0 UNSAFE=3D0 -DIR=3D"/" # So far only qemu and lxc drivers use security driver. URI=3D("qemu:///system" @@ -57,15 +56,6 @@ while getopts hqnu opt; do esac done -shift $((OPTIND - 1)) -if [ $# -gt 0 ]; then - DIR=3D$1 -else - if [ ${UNSAFE} -eq 1 ]; then - die "Unsafe mode (-u) requires explicit 'PATH' argument" - fi -fi - case $(uname -s) in Linux) XATTR_PREFIX=3D"trusted.libvirt.security" @@ -95,17 +85,34 @@ for i in "dac" "selinux"; do XATTRS+=3D("$XATTR_PREFIX.$i" "$XATTR_PREFIX.ref_$i" "$XATTR_PREFIX.ti= mestamp_$i") done +fix_xattrs() { + local DIR=3D"$1" -for i in $(getfattr -R -d -m ${XATTR_PREFIX} --absolute-names ${DIR} 2>/de= v/null | grep "^# file:" | cut -d':' -f 2); do - if [ ${DRY_RUN} -ne 0 ]; then - getfattr -d -m $p --absolute-names $i | grep -v "^# file:" - continue - fi + for i in $(getfattr -R -d -m ${XATTR_PREFIX} --absolute-names ${DIR} 2= >/dev/null | grep "^# file:" | cut -d':' -f 2); do + if [ ${DRY_RUN} -ne 0 ]; then + getfattr -d -m $p --absolute-names $i | grep -v "^# file:" + continue + fi - if [ ${QUIET} -eq 0 ]; then - echo "Fixing $i"; - fi - for x in ${XATTRS[*]}; do - setfattr -x $x $i + if [ ${QUIET} -eq 0 ]; then + echo "Fixing $i"; + fi + for x in ${XATTRS[*]}; do + setfattr -x $x $i + done done -done +} + + +shift $((OPTIND - 1)) +if [ $# -gt 0 ]; then + while [ $# -gt 0 ]; do + fix_xattrs "$1" + shift $((OPTIND - 1)) + done +else + if [ ${UNSAFE} -eq 1 ]; then + die "Unsafe mode (-u) requires explicit 'PATH' argument" + fi + fix_xattrs "/" +fi --=20 2.28.0