Mirrors/vm-bhyve
1
0
Fork 0
mirror of https://github.com/churchers/vm-bhyve.git synced 2025-12-11 01:10:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace genisoimage with makefs(8) from the base

Browse Source
This commit is contained in:
Marek Zarychta
2024-03-15 17:05:51 +01:00
parent 6f17f66b29
commit d88bc164ff
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/vm-core
View File

@@ -182,12 +182,6 @@ core::create(){
# make sure template has a disk before we start creating anything
[ -z "${_disk}" ] && util::err "template is missing disk0_name specification"
if [ -n "${_enable_cloud_init}" ]; then
if ! which genisoimage > /dev/null; then
util::err "Error: genisoimage is required to work with cloud init! Run 'pkg install cdrkit-genisoimage'."
fi
fi
# get ssh public key for cloud-init from file
if [ -n "${_ssh_key_file}" ]; then
@@ -317,7 +311,7 @@ ssh_authorized_keys:
EOF
fi
genisoimage -output "${VM_DS_PATH}/${_name}/seed.iso" -volid cidata -joliet -rock ${_cloud_init_dir}/* > /dev/null 2>&1 || util::err "Can't write seed.iso for cloud-init"
makefs -t cd9660 -o R,L=cidata "${VM_DS_PATH}/${_name}/seed.iso" ${_cloud_init_dir} || util::err "Can't write seed.iso for cloud-init"
config::set "${_name}" "disk${_num}_type" "ahci-cd"
config::set "${_name}" "disk${_num}_name" "seed.iso"
config::set "${_name}" "disk${_num}_dev" "file"