github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-14 15:44:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8374 from jodh-intel/kata-manager-check-dl-url-count

Browse Source 
utils: kata-manager: Ensure only one download URL
This commit is contained in:
James O. D. Hunt 2023-11-10 13:19:07 +00:00 committed by GitHub
commit f588d31324
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
utils/kata-manager.sh
View File

@ -196,6 +196,15 @@ github_get_release_file_url()
[ -z "$download_url" ] && die "Cannot determine download URL for version $version ($url)" [ -z "$download_url" ] && die "Cannot determine download URL for version $version ($url)"
# Check to ensure there is only a single matching URL
local expected_count=1
local count
count=$(echo "$download_url" | wc -l)
[ "$count" -eq "$expected_count" ] || \
die "expected $expected_count download URL but found $download_url"
echo "$download_url" echo "$download_url"
} }
@ -501,7 +510,7 @@ configure_containerd()
sudo grep -q "$kata_runtime_type" "$containerd_config" || { sudo grep -q "$kata_runtime_type" "$containerd_config" || {
sudo cp "$containerd_config" "${original}" sudo cp "$containerd_config" "${original}"
info "Backed up $containerd_config to $original" info "Backed up containerd config file '$containerd_config' to '$original'"
} }
local modified="false" local modified="false"
@ -553,7 +562,7 @@ configure_containerd()
modified="true" modified="true"
fi fi
[ "$modified" = "true" ] && info "Modified $containerd_config" [ "$modified" = "true" ] && info "Modified containerd config file '$containerd_config'"
sudo systemctl enable containerd sudo systemctl enable containerd
sudo systemctl start containerd sudo systemctl start containerd
@ -657,7 +666,7 @@ configure_kata()
-e 's/^kernel_params = "\(.*\)"/kernel_params = "\1 agent.log=debug"/g' \ -e 's/^kernel_params = "\(.*\)"/kernel_params = "\1 agent.log=debug"/g' \
"$cfg_to" "$cfg_to"
info "Configured $kata_project for full debug (delete $cfg_to to use pristine $kata_project configuration)" info "Configured $kata_project for full debug (delete '$cfg_to' to use pristine $kata_project configuration)"
} }
handle_kata() handle_kata()