new commit

builder/core/bootloaders.py

@@ -273,7 +273,7 @@ def create_grub_efi_boot(architecture, paths, grub_cfg_template_dir, memtest_wan
                  f"--format={grub_platform}",
                  f"--output={efi_file_tmp_path}",
                  f"boot/grub/grub.cfg"
-           ]
+            ]
             try:
                 logger.debug(f"  => Creating EFI/BOOT directory in: {os.path.join(grub_efi_tmpdir, 'EFI', 'BOOT')}")
                 subprocess.run(["mkdir", "-p", os.path.join(grub_efi_tmpdir, "EFI", "BOOT")], check=True)

builder/core/iso_generator.py

@@ -100,9 +100,9 @@ def iso_generator_main(
     logging.info("=> Generating ISO image with xorriso...")
     xorriso_command = [
         "xbps-uchroot",
-        "--",
         paths['PEPHOSTDIR'],
         "/usr/bin/xorriso",
+        "--",
         "-as", "mkisofs",
         "-iso-level", "3",
         "-rock",

builder/core/squashfs.py

@@ -98,9 +98,9 @@ def create_squashfs_image(rootfs_dir, squashfs_output_file, pep_host_dir, logger
         os.makedirs(output_dir, exist_ok=True)
         mksquashfs_command = [
             "xbps-uchroot",
-            "--",
             pep_host_dir,
             "/usr/bin/mksquashfs",
+            "--",
             os.path.join(build_dir, "tmp"),
             squashfs_output_file,
             "-comp", "zstd",