Skip to content

Commit dad34ae

Browse files
committed
linuxkit: cleanup debug logging
Signed-off-by: Ricardo Pardini <[email protected]>
1 parent 8f25b43 commit dad34ae

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

bash/linuxkit.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,14 @@ function linuxkit_build() {
153153
fi
154154

155155
# rename outputs
156-
mv -v "${lk_output_dir}/hook-kernel" "${lk_output_dir}/vmlinuz-${OUTPUT_ID}"
157-
mv -v "${lk_output_dir}/hook-initrd.img" "${lk_output_dir}/initramfs-${OUTPUT_ID}"
156+
mv "${debug_dash_v[@]}" "${lk_output_dir}/hook-kernel" "${lk_output_dir}/vmlinuz-${OUTPUT_ID}"
157+
mv "${debug_dash_v[@]}" "${lk_output_dir}/hook-initrd.img" "${lk_output_dir}/initramfs-${OUTPUT_ID}"
158158
rm "${lk_output_dir}/hook-cmdline"
159159

160160
# prepare out/hook dir with the kernel/initramfs pairs; this makes it easy to deploy to /opt/hook eg for stack chart (or nibs)
161161
mkdir -p "out/hook"
162-
mv -v "${lk_output_dir}/vmlinuz-${OUTPUT_ID}" "out/hook/vmlinuz-${OUTPUT_ID}"
163-
mv -v "${lk_output_dir}/initramfs-${OUTPUT_ID}" "out/hook/initramfs-${OUTPUT_ID}"
162+
mv "${debug_dash_v[@]}" "${lk_output_dir}/vmlinuz-${OUTPUT_ID}" "out/hook/vmlinuz-${OUTPUT_ID}"
163+
mv "${debug_dash_v[@]}" "${lk_output_dir}/initramfs-${OUTPUT_ID}" "out/hook/initramfs-${OUTPUT_ID}"
164164

165165
declare -a output_files=("vmlinuz-${OUTPUT_ID}" "initramfs-${OUTPUT_ID}")
166166

@@ -192,16 +192,16 @@ function linuxkit_build() {
192192

193193
if [[ "${OUTPUT_TARBALL_FILELIST:-"no"}" == "yes" ]]; then
194194
log info "OUTPUT_TARBALL_FILELIST=yes; including tar and filelist in output."
195-
mv -v "${lk_output_dir}/hook.tar" "out/hook/hook_rootfs_${OUTPUT_ID}.tar"
196-
tar --list -vf "out/hook/hook_rootfs_${OUTPUT_ID}.tar" > "out/hook/hook_rootfs_${OUTPUT_ID}.filelist"
195+
mv "${debug_dash_v[@]}" "${lk_output_dir}/hook.tar" "out/hook/hook_rootfs_${OUTPUT_ID}.tar"
196+
tar --list -f "${debug_dash_v[@]}" "out/hook/hook_rootfs_${OUTPUT_ID}.tar" > "out/hook/hook_rootfs_${OUTPUT_ID}.filelist"
197197
fi
198198

199199
# finally clean up the hook-specific out dir
200200
rm -rf "${lk_output_dir}"
201201

202202
# tar the files into out/hook.tar in such a way that vmlinuz and initramfs are at the root of the tar; pigz it
203203
# Those are the artifacts published to the GitHub release
204-
tar -cvf- -C "out/hook" "${output_files[@]}" | pigz > "out/hook_${OUTPUT_ID}.tar.gz"
204+
tar "${debug_dash_v[@]}" -cf- -C "out/hook" "${output_files[@]}" | pigz > "out/hook_${OUTPUT_ID}.tar.gz"
205205
}
206206

207207
function linuxkit_run_qemu() {

0 commit comments

Comments
 (0)