github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-01 17:06:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10149 from fidencio/topic/kata-manager-relax-opt-check

Browse Source 
kata-manager: Only check files when tarball is not passed
This commit is contained in:
Fabiano Fidêncio
2024-08-13 16:26:16 +02:00
committed by GitHub
parent 91084058ae 5fe65e9fc2
commit 99730256a2
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
utils/kata-manager.sh
View File

@@ -803,6 +803,13 @@ install_kata()
local from_dir local from_dir
from_dir=$(printf "%s/bin" "$kata_install_dir") from_dir=$(printf "%s/bin" "$kata_install_dir")
if [ -n "$kata_tarball" ]
then
info "Installing $project release from $file"
else
# Only do the checking in case the tarball was not explicitly passed
# by the user. We have no control of what's passed and we cannot
# expect that all the files are going to be under /opt.
info "Checking file '$file'" info "Checking file '$file'"
# Since we're unpacking to the root directory, perform a sanity check # Since we're unpacking to the root directory, perform a sanity check
@@ -813,10 +820,6 @@ install_kata()
[ -n "$unexpected" ] && die "File '$file' contains unexpected paths: '$unexpected'" [ -n "$unexpected" ] && die "File '$file' contains unexpected paths: '$unexpected'"
if [ -n "$kata_tarball" ]
then
info "Installing $project release from $file"
else
info "Installing $project release $version from $file" info "Installing $project release $version from $file"
fi fi