File tree Expand file tree Collapse file tree 2 files changed +2
-9
lines changed Expand file tree Collapse file tree 2 files changed +2
-9
lines changed Original file line number Diff line number Diff line change @@ -60,8 +60,8 @@ function resolve_latest_kernel_version_lts() { # Produces KERNEL_POINT_RELEASE
60
60
# HookOS using an existing kernel container image from the registry. This only works with
61
61
# unauthenticated registries.
62
62
if [[ -n " ${USE_LATEST_BUILT_KERNEL} " ]]; then
63
- reg=" $( echo ${HOOK_KERNEL_OCI_BASE} | cut -d' /' -f1) "
64
- repo=" $( echo ${HOOK_KERNEL_OCI_BASE} | cut -d' /' -f2-) "
63
+ reg=" $( echo " ${HOOK_KERNEL_OCI_BASE} " | cut -d' /' -f1) "
64
+ repo=" $( echo " ${HOOK_KERNEL_OCI_BASE} " | cut -d' /' -f2-) "
65
65
# expected format is: 6.6.32-14b8be17 (major.minor.point-hash)
66
66
latest_point_release=" $( curl -sL " https://${reg} /v2/${repo} /tags/list" | jq -r " .tags[]" | grep -e " ^${KERNEL_MAJOR} .${KERNEL_MINOR} " | sort -V | tail -n1 | cut -d" -" -f1 | cut -d" ." -f3) "
67
67
log info " Using latest point release from registry ${HOOK_KERNEL_OCI_BASE} for kernel ${KERNEL_MAJOR} .${KERNEL_MINOR} : ${latest_point_release} "
Original file line number Diff line number Diff line change @@ -55,13 +55,6 @@ function calculate_kernel_version_default() {
55
55
input_hash=" $( cat " kernel/configs/${INPUT_DEFCONFIG} " " kernel/Dockerfile" | sha256sum - | cut -d ' ' -f 1) "
56
56
short_input_hash=" ${input_hash: 0: 8} "
57
57
kernel_oci_version=" ${KERNEL_MAJOR} .${KERNEL_MINOR} .${KERNEL_POINT_RELEASE} -${short_input_hash} "
58
-
59
- kernel_id_to_use=" ${inventory_id} "
60
- if [[ -n " ${USE_KERNEL_ID} " ]]; then
61
- log warn " USE_KERNEL_ID is set to '${USE_KERNEL_ID} '; using it instead of the default inventory_id '${inventory_id} '."
62
- kernel_id_to_use=" ${USE_KERNEL_ID} "
63
- fi
64
-
65
58
kernel_oci_image=" ${HOOK_KERNEL_OCI_BASE} :${kernel_oci_version} "
66
59
67
60
# Log the obtained version & images to stderr
You can’t perform that action at this time.
0 commit comments