Skip to content

Commit

Permalink
Merge pull request #8733 from fidencio/topic/fix-shim-check-for-snaps…
Browse files Browse the repository at this point in the history
…hotter-configration

kata-deploy: Fix shim check for snapshotter configuration
  • Loading branch information
fidencio committed Dec 27, 2023
2 parents 8895cb8 + 6ee7fb5 commit 35f88df
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/packaging/kata-deploy/scripts/kata-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ function configure_containerd_runtime() {
fi

value="${m#*$snapshotters_delimiter}"
tomlq -i -t $(printf '%s.snapshotter=%s' ${shim} ${value}) ${containerd_conf_file}
tomlq -i -t $(printf '%s.snapshotter="%s"' ${runtime_table} ${value}) ${containerd_conf_file}
break
done
fi
Expand Down Expand Up @@ -481,7 +481,7 @@ function snapshotter_handler_mapping_validation_check() {
die "The snapshotter must follow the \"shim:snapshotter,shim:snapshotter,...\" format, but at least one snapshotter is empty"
fi

if ! grep -q " $shim " <<< " $shims "; then
if ! grep -q " $shim " <<< " $SHIMS "; then
die "\"$shim\" is not part of \"$SHIMS\""
fi

Expand Down

0 comments on commit 35f88df

Please sign in to comment.