From patchwork Thu Feb 6 21:55:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Gomez X-Patchwork-Id: 13963806 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6FED722DF9A for ; Thu, 6 Feb 2025 21:55:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738878921; cv=none; b=T18hPURvNGjBG1BQlS7fc5+ERqa4nFHYJpUboJ7sGZM+qU/OdAbPpLNF+6hcjBsEKQWQYDcKPimUeUrPANOderQ5Q9uuiJ2CRPbVBk+SWC4HSa79xZB65Ry8gkf5RX4Mc3IR5+h4VKzo+COH4FgvMM0ILL3HBF1noT/KBBKe8XA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738878921; c=relaxed/simple; bh=PnCPEbhdZuiD2HzwPkDgTWyAjIlSyETiYnXvrP5+9X4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mpt3KHeRc9LLyIuYIAEVI1FwQBvCEJmSV/aHPtbasMuWqa7Y4XsWhK37BONQq2J4E95F1dMSJpNHV0z9IFR+TN3FjlkgwkHu1D6GOfQXf1aW3pcJ42AL/AN8+Ytuln78pUahBpxQrPdrrZW5PY90N/YACIXrSrAqC5YXbfLAO44= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Jx2Q8ry4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Jx2Q8ry4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 61138C4CEDF; Thu, 6 Feb 2025 21:55:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738878921; bh=PnCPEbhdZuiD2HzwPkDgTWyAjIlSyETiYnXvrP5+9X4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Jx2Q8ry4O8ZCdXUQ8qjJ4gAA7LiPlwDWuT7KdQW7rOIBOkj6Mi4iX3jsCURKrau8K 1Vns/5xymJTtr+0gyAwknVSTe5FLZNWqhC8Pd39lbL1JxoxrNB0YfEoU3AseH+6jDl UKAEmaYv4saVunJEWcbVYQM7orevNQJjRaLyBzyJBtFEQRIZ1Nv4q3U5/vO1OlmaAa OBbpD366rvI1p40VAAfFbprxIoWGOvlW4msMrH2+faZyD9nsjlPmTbho7Sd6eSlpCG GQGaqT4muhtvA8gQe3C16CkWgI/prGwqbA5LuIyPslXSzLhCUvhOGD6ETdarMpXP8o hashdS7CKSPGA== From: da.gomez@kernel.org Date: Thu, 06 Feb 2025 21:55:06 +0000 Subject: [PATCH 1/4] install_terraform: fix missing deps Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250206-small-fixes-v1-1-4834edb167a3@samsung.com> References: <20250206-small-fixes-v1-0-4834edb167a3@samsung.com> In-Reply-To: <20250206-small-fixes-v1-0-4834edb167a3@samsung.com> To: Luis Chamberlain Cc: kdevops@lists.linux.dev, Daniel Gomez X-Mailer: b4 0.14.2 From: Daniel Gomez In a freshed Debian Testing machine, Terraform can't be extracted because it requires zip to be present. Add a task to check Terraform packages before unpacking Terraform release. Error: "msg": "Failed to find handler for \"/home/dagomez/.ansible/tmp/ansible-tmp-1738158342.0404465-41967-103098 632274351/terraform_1.2.3_linux_amd649158dhyg.zip\". Make sure the required command to extract the file is installed.\nCommand \"/usr/bin/tar\" could not handle archive: Unable to list files in the archive: /usr/bin/tar: This does not look like a tar archive\n/usr/bin/tar: Skipping to next header\n/usr/bin/tar: Exiting with failure status due to previous errors\n\nUnable to find required 'unzip' or 'zipinfo' binary in the path.\nCommand \"/usr/bin/tar\" could not handle archive: Unable to list files in the archive: xz: (stdin): File format not recognized\n/usr/bin/tar: Child returned status 1\n/usr/bin/tar: Error is not recoverable: exiting now\n\nUnable to find required 'unzip' or 'unzip' binary in the path.\nCommand \"/usr/bin/tar\" could not handle archive: Unable to list files in the archive: zstd: /*stdin*\\: unsupported format \n/usr/bin/tar: Child returned status 1\n/usr/bin/tar: Error is not recoverable: exiting now\n\nCommand \"/usr/bin/tar\" could not handle archive: Unable to list files in the archive: bzip2: (stdin) is not a bzip2 file.\n/usr/bin/tar: Child returned status 2\n/usr/bin/tar: Error is not recoverable: exiting now\n" } Signed-off-by: Daniel Gomez --- .../roles/install_terraform/tasks/install-deps/debian/main.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/playbooks/roles/install_terraform/tasks/install-deps/debian/main.yml b/playbooks/roles/install_terraform/tasks/install-deps/debian/main.yml index 3397f403cbf53254c0ac0d8ff0468512eaf0f758..f7753f8667d950cf7d7d2b5ccbc0a89f9b882a69 100644 --- a/playbooks/roles/install_terraform/tasks/install-deps/debian/main.yml +++ b/playbooks/roles/install_terraform/tasks/install-deps/debian/main.yml @@ -6,6 +6,15 @@ failed_when: terraform_present.rc != 0 and terraform_present.rc != 1 tags: [ 'terraform', 'verify' ] +- name: Install Terraform Dependencies + become: true + become_method: sudo + ansible.builtin.apt: + name: + - unzip + state: present + update_cache: true + - name: Download Terraform from the latest release and install locally become: yes become_method: sudo From patchwork Thu Feb 6 21:55:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Gomez X-Patchwork-Id: 13963808 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92AC5225A52 for ; Thu, 6 Feb 2025 21:55:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738878922; cv=none; b=GMsDD7dXLlwK2IHO6DobljV6qkY+BfxP0mMAeTdIHWKcsQxsunFX6IzAvPjTQmZxzVLBWyD5qB922zQnfLrcCPglSLjPLQBkZxbeuJYreSGUyQh5xcuMNplOE1+v9iR/3BjpP5YsKLslGIkbdmgtcTc54262V7RQe5lxENkRZ3Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738878922; c=relaxed/simple; bh=WiWmflkEAbWThaYvgkqJONyozBSR89NiGkA5dLchYww=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=L8lUf6ROqHchAEL1kd0aUiq59ecvy+jxR1LhUl0pggQ6/IUPkt5yYeJJndXghqKEJGHHlyCygYOmHtDNyGt/IByD1dCA7Aad3VLqnA/608WHjU4Fq94elKBpHx4TvInix59pBfnDvyh2cWSgZr33TrWYcY6m7iB+r3WNc64ie3g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IyGo3jk+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IyGo3jk+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6CC1FC4CEE2; Thu, 6 Feb 2025 21:55:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738878922; bh=WiWmflkEAbWThaYvgkqJONyozBSR89NiGkA5dLchYww=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=IyGo3jk+Q+WYXRPM4+ym2sfNk3+bLJLswcUXsI2ccugMifj2xJ7mJYOBiNIQUKPHn fcpXvoRSnCUvivlpdfOuaaA7hMrMZv4dDRurfBOkI5PZpPsit3Bo/++g1FaFcE04bQ HkYV3DD1fB0Z1NZLlxVVb3wzSwJj3h0qlUTnAHf+zHg2d5rLn+TGEqNVvvTA3mA0cL br6S/8ooaHyZX+RXXMr8diTwNkMPvmGOMwpf4XmuxaTsN9nnoHvy6UmVLfGyDSkP+1 9qkstkejdxxrXkCNqzgFB39Y7C1FrDL1Hi03ktc0nh31roDRXm2/PYuaJv7iXLCshQ daLwrfIi0c15w== From: da.gomez@kernel.org Date: Thu, 06 Feb 2025 21:55:07 +0000 Subject: [PATCH 2/4] linux-mirror: fix variable initialization Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250206-small-fixes-v1-2-4834edb167a3@samsung.com> References: <20250206-small-fixes-v1-0-4834edb167a3@samsung.com> In-Reply-To: <20250206-small-fixes-v1-0-4834edb167a3@samsung.com> To: Luis Chamberlain Cc: kdevops@lists.linux.dev, Daniel Gomez X-Mailer: b4 0.14.2 From: Daniel Gomez Fixes error: TASK [linux-mirror : Import optional extra_args file] ok: [localhost] => (item=/media/tarkir/dagomez/src/linux-kdevops/kdevops/extra_vars.yaml) TASK [linux-mirror : Fail if linux_mirror_nfs is enabled but user is not root] fatal: [localhost]: FAILED! => {} MSG: The conditional check 'linux_mirror_nfs | bool' failed. The error was: error while evaluating conditional (linux_mirror_nfs | bool): 'linux_mirror_nfs' is undefined The error appears to be in '/media/tarkir/dagomez/src/linux-kdevops/kdevops/playbooks/roles/linux-m irror/tasks/main.yml': line 19, column 3, but may be elsewhere in the file depending on the exact syntax problem. The offending line appears to be: - name: Fail if linux_mirror_nfs is enabled but user is not root ^ here Signed-off-by: Daniel Gomez --- playbooks/roles/linux-mirror/defaults/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/playbooks/roles/linux-mirror/defaults/main.yml b/playbooks/roles/linux-mirror/defaults/main.yml index 2839068c1244395fa392392f6f64ac616353a354..c95342591090b405c3b5ca02cedc27917b3e942f 100644 --- a/playbooks/roles/linux-mirror/defaults/main.yml +++ b/playbooks/roles/linux-mirror/defaults/main.yml @@ -23,3 +23,5 @@ mirror_stable_url: "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux mirror_torvalds_url: "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" install_only_git_daemon: false + +linux_mirror_nfs: False From patchwork Thu Feb 6 21:55:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Gomez X-Patchwork-Id: 13963809 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9A4B9225A52 for ; Thu, 6 Feb 2025 21:55:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738878923; cv=none; b=LCvcK6X1YN8deo7+POS8XL0DGmsoutk5r6Rw16eYKcsMxLIYIzD/6Ugh9P6wNQHlT0wuQP+uYB/0VDBMeY62YQRaAdWb2o6fB4M0gt7c/6VmiKYos/0zi1Wd1VwxOwcmZQMjteJNxjHqmmfMgt/er+WjsayIDfRkWr3q4JbfzfI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738878923; c=relaxed/simple; bh=RQwjHQoyDFtMmVW4xwAsM3AUg1fJMpN1VXw9vcLtrfQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KWi9KeF7ZIQfMCGqpAw/tyEqua9x2wl6jiOZgKnl8xfT9/mJa7JmeMj8mF9ZaSoNqHdASimefcXZ8L73ul1cFijjdbZQUIxafz/cNhm1jB5KeO1nXVy65hSPmtox0nkg0Ny7K1YLkCJzEETx9M2pvLTAGpilBad/FvB+WrJkwns= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CUCXxC3h; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CUCXxC3h" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 784B4C4CEDF; Thu, 6 Feb 2025 21:55:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738878923; bh=RQwjHQoyDFtMmVW4xwAsM3AUg1fJMpN1VXw9vcLtrfQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=CUCXxC3h2s49JMDYbgqiAempv/YZY/4D2LEAwiNTnuP/BZ6MCIXjtszJrGqKiQC3w CgBcLS4P9aJWC5jRgTwageLmaBBsmtjaiFHSN/81WRC3XGswUzH9Yi8svr/gtgxKwN ZLnGF4CQk3lcLY2jW5UFJMt/TOAp9bbjbLja9TrJUC/ZFjk/OgHezd3MfwbnpF/s/y Us1U6VFZSptl8xYwBmf7QALPSW1PKe3CdXS0TC+u6KBT4HIMzWNeJtaopikr9v/qCn JLTQ9wMdpOQdnO0pgfBlBBwwTmwL7TOrsvZm9bhG/uq/Qm6G4V/YEIfm01n1Om2wRx UZoJ5qnkxq7DA== From: da.gomez@kernel.org Date: Thu, 06 Feb 2025 21:55:08 +0000 Subject: [PATCH 3/4] scripts: lib: rename KDEVOPS_WORKFLOW_FSTESTS Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250206-small-fixes-v1-3-4834edb167a3@samsung.com> References: <20250206-small-fixes-v1-0-4834edb167a3@samsung.com> In-Reply-To: <20250206-small-fixes-v1-0-4834edb167a3@samsung.com> To: Luis Chamberlain Cc: kdevops@lists.linux.dev, Daniel Gomez X-Mailer: b4 0.14.2 From: Daniel Gomez kdevops variable was renamed and this was silently failing. Make sure the proper workflow variable is checked but only if defined/set to avoid 'unbound variable' issue. Signed-off-by: Daniel Gomez --- scripts/lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib.sh b/scripts/lib.sh index 041b7e279a0f9793bcb5ee797caa244ceeccdd01..56093b1a58ea1af104d9c0af2842b105783dbe80 100644 --- a/scripts/lib.sh +++ b/scripts/lib.sh @@ -33,7 +33,7 @@ FSTESTS_STARTED_FILE="${TOPDIR}/workflows/fstests/.begin" BLKTESTS_STARTED_FILE="${TOPDIR}/workflows/blktests/.begin" REBOOT_LIMIT_STARTED_FILE="${TOPDIR}/workflows/demos/reboot-limit/.begin" -if [[ "$CONFIG_KDEVOPS_WORKFLOW_FSTESTS" == "y" ]]; then +if [[ "${CONFIG_KDEVOPS_WORKFLOW_ENABLE_FSTESTS+x}" && "$CONFIG_KDEVOPS_WORKFLOW_ENABLE_FSTESTS" == "y" ]]; then FSTYP="$CONFIG_FSTESTS_FSTYP" TEST_DEV="$CONFIG_FSTESTS_TEST_DEV" fi From patchwork Thu Feb 6 21:55:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Gomez X-Patchwork-Id: 13963810 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A23F4225A52 for ; Thu, 6 Feb 2025 21:55:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738878924; cv=none; b=Y9LYtyG4G6M740B7NWcpFhWC6bCmBelUaHBg9xZXjpwF7pM/cdzbhXdiaRDCyrMppubWzt32mIPXzJ1MhS/ItI3MRrXbQ6JcFTOTAu0qwmy7WyoWnntcfoGhx72LTdH1pX9OJHXiSF1rcSAaCKxzPN5fAjS2bL4QRjz9R2EMlFs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738878924; c=relaxed/simple; bh=lYoYBmQ2i+lxTKtokjrX+xKTjvRZ+JKsZb/akvUd9j8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=E7a/jZaSOvnGCddwHjHkKY7jcplhEPKfBaLJfxaNW9Dk//21JdtGoQSmGdGVOxwtBNYM3g9ZBfy4KXCIAsEe0oTKLJG1G8t8WDC2F5Oxdcm823F48anAwa+/pz30teer5oleimapVQVcqgFl/x0EiHRVFyuOx/1TCFjDKNkTXhE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JBuypWM+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JBuypWM+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84179C4CEDD; Thu, 6 Feb 2025 21:55:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738878924; bh=lYoYBmQ2i+lxTKtokjrX+xKTjvRZ+JKsZb/akvUd9j8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=JBuypWM+qJhb6JqnIznodjnETnf0AktcYdlwG/WuvIhD7c466b0vWo4u8Y7UDJ/iZ Mak01bZh7Uz76r17VKtmM1m7jaA4RfZUWQPwN+FUfMuMsfZJY0u2W+239Yu4cphlsO xrYCTAlXWxGCIsfBW3zaCVeGgja0XvUoC3VVa5HpB7u2gc4M5yXSkx5tr2kj3QO0+G 2jU9KYSG2+tIJ/VyWeu7lizBVOnA68saoSReCICucJRgNE4zNteNRF0sYS/wzYHaT6 aNNc9B3eWJxytiMf/O8SMJsHI1t7HWF1U/f0amQYV6PY64cJQrbeHdmEunzp35aZPu S27Iik3+1QvaQ== From: da.gomez@kernel.org Date: Thu, 06 Feb 2025 21:55:09 +0000 Subject: [PATCH 4/4] bringup_guestfs: ensure pool correct permissions Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250206-small-fixes-v1-4-4834edb167a3@samsung.com> References: <20250206-small-fixes-v1-0-4834edb167a3@samsung.com> In-Reply-To: <20250206-small-fixes-v1-0-4834edb167a3@samsung.com> To: Luis Chamberlain Cc: kdevops@lists.linux.dev, Daniel Gomez X-Mailer: b4 0.14.2 From: Daniel Gomez Ensure correct permissions for the storage pool path top directory. Otherwise, this directory ends with root permissions when LIBVIRT_URI_SYSTEM is used (default). Signed-off-by: Daniel Gomez --- scripts/bringup_guestfs.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/bringup_guestfs.sh b/scripts/bringup_guestfs.sh index 74eeceace9040f6ec716234f8d80ebfe7940dac7..3180b30e5e2d72147c382056f9ee474cce157722 100755 --- a/scripts/bringup_guestfs.sh +++ b/scripts/bringup_guestfs.sh @@ -14,7 +14,8 @@ IMG_FMT="qcow2" if [ "${CONFIG_LIBVIRT_EXTRA_DRIVE_FORMAT_RAW}" = "y" ]; then IMG_FMT="raw" fi -STORAGEDIR="${CONFIG_KDEVOPS_STORAGE_POOL_PATH}/kdevops/guestfs" +STORAGETOPDIR="${CONFIG_KDEVOPS_STORAGE_POOL_PATH}" +STORAGEDIR="${STORAGETOPDIR}/kdevops/guestfs" QEMU_GROUP=$CONFIG_LIBVIRT_QEMU_GROUP GUESTFSDIR="${TOPDIR}/guestfs" OS_VERSION=${CONFIG_VIRT_BUILDER_OS_VERSION} @@ -274,9 +275,9 @@ $USE_SUDO mkdir -p $BASE_IMAGE_DIR if [[ "$CONFIG_LIBVIRT_URI_SYSTEM" == "y" ]]; then - sudo chgrp -R $QEMU_GROUP $STORAGEDIR - sudo chmod -R g+rw $STORAGEDIR - sudo chmod -R g+s $STORAGEDIR + sudo chown -R $(whoami):$QEMU_GROUP $STORAGETOPDIR + sudo chmod -R g+rw $STORAGETOPDIR + sudo chmod -R g+s $STORAGETOPDIR fi cmdfile=$(mktemp)