Move fdcopy 4k check to the caller

fdcopy is used by more things than just the rootfs image

Signed-off-by: Sasha Finkelstein <[email protected]>

Author: WhatAmISupposedToPutHere

src/osinstall.py

@@ -147,6 +147,8 @@ def install(self, stub_ins):
                 p_plain(f"  Extracting {image} into {info.name} partition...")
                 logging.info(f"Extract: {image}")
                 zinfo = self.pkg.getinfo(image)
+                if zinfo.file_size % (4 * 1024) != 0:
+                    raise Exception("The size of the rootfs image file must be a multiple of 4KiB.")
                 with self.pkg.open(image) as sfd, \
                     open(f"/dev/r{info.name}", "r+b") as dfd:
                     self.fdcopy(sfd, dfd, zinfo.file_size)

src/util.py

@@ -197,8 +197,6 @@ def extract(self, src, dest):
         self.extract_file(src, dest_path)
 
     def fdcopy(self, sfd, dfd, size=None):
-        if size is not None and size % (4 * 1024) != 0:
-            raise Exception("The size of the rootfs image file must be a multiple of 4KiB.")
         BLOCK = 16 * 1024 * 1024
         copied = 0
         bps = 0