@@ -83,23 +83,6 @@ function linuxkit_build() {
8383 declare lk_cache_dir=" ${CACHE_DIR} /linuxkit"
8484 mkdir -p " ${lk_cache_dir} "
8585
86- declare -a lk_args=(
87- " --docker"
88- " --arch" " ${kernel_info['DOCKER_ARCH']} "
89- " --name" " hook"
90- " --cache" " ${lk_cache_dir} "
91- " --dir" " ${lk_output_dir} "
92- " hook.${inventory_id} .yaml" # the linuxkit configuration file
93- )
94-
95- if [[ " ${OUTPUT_TARBALL_FILELIST:- " no" } " == " yes" ]]; then
96- log info " OUTPUT_TARBALL_FILELIST=yes; Building Hook (tar/filelist) with kernel ${inventory_id} using linuxkit: ${lk_args[*]} "
97- " ${linuxkit_bin} " build " --format" " tar" " ${lk_args[@]} "
98- fi
99-
100- log info " Building Hook with kernel ${inventory_id} using linuxkit: ${lk_args[*]} "
101- " ${linuxkit_bin} " build " --format" " kernel+initrd" " ${lk_args[@]} "
102-
10386 # if LINUXKIT_ISO is set, build an ISO with the kernel and initramfs
10487 if [[ -n " ${LINUXKIT_ISO} " ]]; then
10588 declare lk_iso_output_dir=" out"
@@ -117,7 +100,25 @@ function linuxkit_build() {
117100
118101 log info " Building Hook ISO with kernel ${inventory_id} using linuxkit: ${lk_iso_args[*]} "
119102 " ${linuxkit_bin} " build " ${lk_iso_args[@]} "
103+ return 0
120104 fi
105+
106+ declare -a lk_args=(
107+ " --docker"
108+ " --arch" " ${kernel_info['DOCKER_ARCH']} "
109+ " --name" " hook"
110+ " --cache" " ${lk_cache_dir} "
111+ " --dir" " ${lk_output_dir} "
112+ " hook.${inventory_id} .yaml" # the linuxkit configuration file
113+ )
114+
115+ if [[ " ${OUTPUT_TARBALL_FILELIST:- " no" } " == " yes" ]]; then
116+ log info " OUTPUT_TARBALL_FILELIST=yes; Building Hook (tar/filelist) with kernel ${inventory_id} using linuxkit: ${lk_args[*]} "
117+ " ${linuxkit_bin} " build " --format" " tar" " ${lk_args[@]} "
118+ fi
119+
120+ log info " Building Hook with kernel ${inventory_id} using linuxkit: ${lk_args[*]} "
121+ " ${linuxkit_bin} " build " --format" " kernel+initrd" " ${lk_args[@]} "
121122
122123 declare initramfs_path=" ${lk_output_dir} /hook-initrd.img"
123124 # initramfs_path is a gzipped file. obtain the uncompressed byte size, without decompressing it
0 commit comments