Manually merge upstream.

2020-02-04 22:29:43 +01:00
parent def500faaa
commit ad3c0f115c
7 changed files with 19 additions and 10 deletions
@@ -19,7 +19,7 @@ if [ "${NO_PRERUN_QCOW2}" = "0" ]; then
    # some overhead (since actual space usage is usually rounded up to the
    # filesystem block size) and gives some free space on the resulting
    # image.
-    ROOT_MARGIN=$((800*1024*1024))
+    ROOT_MARGIN="$(echo "($ROOT_SIZE * 0.2 + 200 * 1024 * 1024) / 1" | bc)"

    BOOT_PART_START=$((ALIGN))
    BOOT_PART_SIZE=$(((BOOT_SIZE + ALIGN - 1) / ALIGN * ALIGN))