andreil/SBC_builder
1
0
Fork 0
mirror of https://github.com/andreili/SBC_builder.git synced 2025-08-23 19:04:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix installation to block devices

Browse Source
This commit is contained in:
andreili 2025-07-05 22:04:26 +02:00
parent 1c0d4977de
commit 5a4b6458af
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/os.py
View File

@ -323,12 +323,15 @@ class OS:
def __umount_dev(self, dir): def __umount_dev(self, dir):
self.__sudo(["umount", dir], stdout=subprocess.DEVNULL) self.__sudo(["umount", dir], stdout=subprocess.DEVNULL)
def __create_fs(self, img_or_blk): def __create_fs(self, img_or_blk, is_blk):
Logger.install("\tCreate filesystems...") Logger.install("\tCreate filesystems...")
for i in range(len(self.partitions)): for i in range(len(self.partitions)):
if (self.__mount_loop(img_or_blk, i)): if (not is_blk) and (self.__mount_loop(img_or_blk, i)):
self.__sudo(["mkfs.ext2", "/dev/loop0"], stdout=subprocess.DEVNULL) self.__sudo(["mkfs.ext2", "/dev/loop0"], stdout=subprocess.DEVNULL)
self.__umount_loop() self.__umount_loop()
if is_blk:
idx = i + 1
self.__sudo(["mkfs.ext2", "-F", f"{img_or_blk}{idx}"], stdout=subprocess.DEVNULL)
def __copy_file(self, src, dst): def __copy_file(self, src, dst):
Logger.install(f"\tCopy {src}") Logger.install(f"\tCopy {src}")
@ -360,22 +363,23 @@ class OS:
self.__sudo(["mkdir", "-p", f"{out_dir}/.upper"], stdout=subprocess.DEVNULL) self.__sudo(["mkdir", "-p", f"{out_dir}/.upper"], stdout=subprocess.DEVNULL)
self.__sudo(["mkdir", "-p", f"{out_dir}/.work"], stdout=subprocess.DEVNULL) self.__sudo(["mkdir", "-p", f"{out_dir}/.work"], stdout=subprocess.DEVNULL)
def __do_boot(self, img_or_blk): def __do_boot(self, img_or_blk, is_blk):
Logger.install("\tCreate boot files...") Logger.install("\tCreate boot files...")
i = 0 i = 0
os.makedirs(self.mount_dir, exist_ok=True) os.makedirs(self.mount_dir, exist_ok=True)
for part in self.partitions: for part in self.partitions:
if is_blk:
idx = i + 1
self.__mount_dev(f"{img_or_blk}{idx}", self.mount_dir)
else:
self.__mount_loop(img_or_blk, i)
self.__mount_dev("/dev/loop0", self.mount_dir)
if (part.name == "boot"): if (part.name == "boot"):
self.__mount_loop(img_or_blk, i)
self.__mount_dev("/dev/loop0", self.mount_dir)
self.__install_boot(self.mount_dir) self.__install_boot(self.mount_dir)
self.__umount_dev(self.mount_dir)
self.__umount_loop()
if (part.name == "rw"): if (part.name == "rw"):
self.__mount_loop(img_or_blk, i)
self.__mount_dev("/dev/loop0", self.mount_dir)
self.__install_rw(self.mount_dir) self.__install_rw(self.mount_dir)
self.__umount_dev(self.mount_dir) self.__umount_dev(self.mount_dir)
if not is_blk:
self.__umount_loop() self.__umount_loop()
i += 1 i += 1
@ -394,8 +398,8 @@ class OS:
Logger.error("Unsupported instalation type!") Logger.error("Unsupported instalation type!")
self.out_path = dir_or_dev self.out_path = dir_or_dev
self.__create_parts(dir_or_dev, is_blk) self.__create_parts(dir_or_dev, is_blk)
self.__create_fs(dir_or_dev) self.__create_fs(dir_or_dev, is_blk)
self.__do_boot(dir_or_dev) self.__do_boot(dir_or_dev, is_blk)
Logger.install(f"Finished!") Logger.install(f"Finished!")
if __name__ == '__main__': if __name__ == '__main__':