Skip to content

Commit a4538bf

Browse files
committed
Copy everything found in mkosi/extra/ to the image
This is very convenient to add anything to the image "on the fly". Don't use --delete because this could interfere with ndctl/ Signed-off-by: Marc Herbert <[email protected]>
1 parent 874cd63 commit a4538bf

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

run_qemu.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1008,8 +1008,6 @@ check_ndctl_dir()
10081008

10091009
prepare_ndctl_build()
10101010
{
1011-
cp "${script_dir}"/mkosi/extra/root/reinstall_ndctl.sh \
1012-
mkosi.extra/root/
10131011
cat <<- 'EOF' > mkosi.postinst
10141012
#!/bin/sh
10151013
# v14: 'systemd-nspawn"; v15: "mkosi"
@@ -1127,6 +1125,8 @@ make_rootfs()
11271125
process_mkosi_template "$tmpl" > "$dst"
11281126
done
11291127

1128+
rsync -a "${script_dir}"/mkosi/extra/ mkosi.extra/
1129+
11301130
# misc rootfs setup
11311131
mkdir -p mkosi.extra/root/.ssh
11321132
local pubk

0 commit comments

Comments
 (0)