Skip to content

Commit e3e3038

Browse files
qemu-secex: drop hardcoded 'secex-hostkey' name and inject user-provided file instead
1 parent 073f62f commit e3e3038

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

src/cmd-osbuild

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,22 @@ postprocess_qemu_secex() {
8282
fatal "No hostkey and no genprotimgvm provided"
8383
fi
8484
echo "Generating genprotimgvm locally"
85-
ignition=$(mktemp -p "${tmp_builddir}")
86-
butane -p -d "$(dirname "${hostkey}")" /usr/lib/coreos-assembler/secex-genprotimgvm-scripts/genprotimg.bu -o "${ignition}"
85+
local ignition_cfg=$(mktemp -p "${tmp_builddir}")
86+
local butane_cfg=$(mktemp -p "${tmp_builddir}")
87+
88+
echo "Injecting user-provided hostkey into config"
89+
local hostkey_name=$(basename "${hostkey}")
90+
local hostkey_path=$(dirname "${hostkey}")
91+
cp /usr/lib/coreos-assembler/secex-genprotimgvm-scripts/genprotimg.bu "${butane_cfg}"
92+
sed -i 's/HOSTKEY-FILE/'"${hostkey_name}"'/g' "${butane_cfg}"
93+
butane -p -d "${hostkey_path}" "${butane_cfg}" -o "${ignition_cfg}"
8794

8895
genprotimgvm=/srv/fake-secure-vm.qcow2
8996
cp "/srv/builds/latest/${basearch}/${name}-${build}-qemu.${basearch}.${image_format}" "${genprotimgvm}"
9097
chmod +w "${genprotimgvm}"
9198
genvm_args=("-drive" "if=none,id=hda,file=${genprotimgvm},auto-read-only=off,cache=unsafe" \
9299
"-device" "virtio-blk,drive=hda,bootindex=1")
93-
kola qemuexec -i "${ignition}" -- "${genvm_args[@]}"
100+
kola qemuexec -i "${ignition_cfg}" -- "${genvm_args[@]}"
94101
fi
95102

96103
# Basic qemu args:

src/secex-genprotimgvm-scripts/genprotimg.bu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ storage:
1313
- path: /etc/se-hostkeys/ibm-z-hostkey-1
1414
overwrite: true
1515
contents:
16-
local: secex-hostkey
16+
local: HOSTKEY-FILE
1717
- path: /etc/do_genprotimg
1818
overwrite: true
1919
mode: 0755

0 commit comments

Comments
 (0)