zip-image: factor out with common

Notably, only include the strictly necessary files in the archive, otherwise
initrd's from other builds might get in the way.
This commit is contained in:
Ciro Santilli
2018-08-09 22:25:52 +01:00
parent f5a997b2b6
commit b675cf35cb
6 changed files with 11 additions and 10 deletions

4
run
View File

@@ -307,7 +307,7 @@ ${vnc}"
rrid=
snapshot=,snapshot
fi
extra_flags="${extra_flags} -drive 'file=${common_images_dir}/rootfs.ext2.qcow2,format=qcow2,if=${driveif}${snapshot}${rrid}' \\
extra_flags="${extra_flags} -drive 'file=${common_qcow2_file},format=qcow2,if=${driveif}${snapshot}${rrid}' \\
"
if [ -n "$rr" ]; then
extra_flags="${extra_flags} \\
@@ -371,7 +371,7 @@ ${extra_flags} \
if ! "$ramfs"; then
root='root=/dev/hda'
extra_flags="${extra_flags} \
-drive 'file=${common_images_dir}/rootfs.ext2.qcow2,format=qcow2${snapshot}' \\
-drive 'file=${common_qcow2_file},format=qcow2${snapshot}' \\
"
fi
cmd="\