diff --git a/DEBIAN/control b/DEBIAN/control index c121b195..70caa3c2 100644 --- a/DEBIAN/control +++ b/DEBIAN/control @@ -1,5 +1,5 @@ Package: system-installer -Version: 2.1.9 +Version: 2.2.0 Maintainer: Thomas Castleman Homepage: https://github.com/drauger-os-development/system-installer Section: admin diff --git a/usr/bin/system-installer.cxx b/usr/bin/system-installer.cxx index c6eba33f..234faa4d 100644 --- a/usr/bin/system-installer.cxx +++ b/usr/bin/system-installer.cxx @@ -46,7 +46,7 @@ using namespace std; -str VERSION = "2.1.9"; +str VERSION = "2.2.0"; str R = "\033[0;31m"; str G = "\033[0;32m"; str Y = "\033[1;33m"; diff --git a/usr/share/system-installer/auto_partitioner.py b/usr/share/system-installer/auto_partitioner.py index 7420d49c..8e19b19e 100755 --- a/usr/share/system-installer/auto_partitioner.py +++ b/usr/share/system-installer/auto_partitioner.py @@ -422,7 +422,8 @@ def partition(root, efi, home, raid_array): except parted._ped.DiskLabelException: common.eprint("NO PARTITION TABLE EXISTS. MAKING NEW ONE . . .") disk = parted.freshDisk(device, "gpt") - size = sectors_to_size(device.length, device.sectorSize) * 1000 + # sectors_to_size() returns size in MBs, multiply by 1 million to convert to bytes + size = sectors_to_size(device.length, device.sectorSize) * 1000000 if ((home in ("NULL", "null", None, "MAKE")) and (raid_array["raid_type"] is None)): disk = clobber_disk(device)