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

Merge pull request #536 from churchers/issue/535

Browse Source 
Resize file backed images after writting cloud image with qemu-img
This commit is contained in:
Mateusz Kwiatkowski
2024-09-10 10:59:39 +02:00
committed by GitHub
parent e392f82df5 350cd9ee47
commit 31358b639c
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/vm-core
View File

@@ -220,11 +220,11 @@ core::create(){
case "${_disk_dev}" in
zvol)
zfs::make_zvol "${VM_DS_ZFS_DATASET}/${_name}/${_disk}" "${_disk_size}" "0" "${_zfs_opts}"
[ $_num -eq 0 ] && [ ! -z "$_img" ] && core::write_img "/dev/zvol/${VM_DS_ZFS_DATASET}/${_name}/${_disk}" "${_img}"
[ $_num -eq 0 ] && [ ! -z "$_img" ] && core::write_img "/dev/zvol/${VM_DS_ZFS_DATASET}/${_name}/${_disk}" "${_img}" "${_disk_dev}" "${_disk_size}"
;;
sparse-zvol)
zfs::make_zvol "${VM_DS_ZFS_DATASET}/${_name}/${_disk}" "${_disk_size}" "1" "${_zfs_opts}"
[ $_num -eq 0 ] && [ ! -z "$_img" ] && core::write_img "/dev/zvol/${VM_DS_ZFS_DATASET}/${_name}/${_disk}" "${_img}"
[ $_num -eq 0 ] && [ ! -z "$_img" ] && core::write_img "/dev/zvol/${VM_DS_ZFS_DATASET}/${_name}/${_disk}" "${_img}" "${_disk_dev}" "${_disk_size}"
;;
custom)
;;
@@ -236,7 +236,7 @@ core::create(){
# make sure only owner can read the disk image
chmod 600 "${VM_DS_PATH}/${_name}/${_disk}"
[ $_num -eq 0 ] && [ ! -z "$_img" ] && core::write_img "${VM_DS_PATH}/${_name}/${_disk}" "${_img}"
[ $_num -eq 0 ] && [ ! -z "$_img" ] && core::write_img "${VM_DS_PATH}/${_name}/${_disk}" "${_img}" "file" "${_disk_size}"
;;
esac
@@ -330,6 +330,8 @@ core::write_img(){
shift $?
_disk_dev="${1}"
_img="$2"
_disk_type="$3"
_disk_size="$4"
timeout=30
i=0
@@ -349,6 +351,14 @@ core::write_img(){
if [ $? -ne 0 ]; then
util::err "failed to write img file with qemu-img"
fi
# if disk type is file then we need to resize it
if [ "${_disk_type}" = "file" ]; then
qemu-img resize "${_disk_dev}" "${_disk_size}"
if [ $? -ne 0 ]; then
util::err "failed to resize img file with qemu-img"
fi
fi
}
# 'vm add'