almalinux/lorax
14
1
Fork 0
Code Issues Pull Requests Releases Activity

livemedia-creator: Fix off by 1024 error (#1353140)

Browse Source 
commit 4699c88109 changed how the disk
size is estimated and not all users took into account that the return
value is in MiB.

This would result in qemu based iso installations having a rootfs.img
that was 1024x too large.

(cherry picked from commit 6798f7c5ec)
This commit is contained in:
Brian C. Lane 2016-03-21 12:14:28 -07:00
parent 4a2d28553e
commit 9bf1a846da
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sbin/livemedia-creator
View File

@ -978,6 +978,8 @@ def calculate_disk_size(opts, ks):
:param opts: options passed to livemedia-creator :param opts: options passed to livemedia-creator
:type opts: argparse options :type opts: argparse options
:param str ks: Path to the kickstart to use for the installation :param str ks: Path to the kickstart to use for the installation
:returns: Disk size in MiB
:rtype: int
Use virt-install or anaconda to install to a disk image. Use virt-install or anaconda to install to a disk image.
""" """
@ -1486,7 +1488,7 @@ def main():
disk_img = opts.disk_image or disk_img disk_img = opts.disk_image or disk_img
with PartitionMount(disk_img) as img_mount: with PartitionMount(disk_img) as img_mount:
if img_mount and img_mount.mount_dir: if img_mount and img_mount.mount_dir:
make_runtime(opts, img_mount.mount_dir, work_dir, calculate_disk_size(opts, ks)) make_runtime(opts, img_mount.mount_dir, work_dir, calculate_disk_size(opts, ks)/1024.0)
result_dir = make_livecd(opts, img_mount.mount_dir, work_dir) result_dir = make_livecd(opts, img_mount.mount_dir, work_dir)
# --iso-only removes the extra build artifacts, keeping only the boot.iso # --iso-only removes the extra build artifacts, keeping only the boot.iso