new commit
This commit is contained in:
parent
4c60cc89c0
commit
9bc4cf958a
@ -273,7 +273,7 @@ def create_grub_efi_boot(architecture, paths, grub_cfg_template_dir, memtest_wan
|
|||||||
f"--format={grub_platform}",
|
f"--format={grub_platform}",
|
||||||
f"--output={efi_file_tmp_path}",
|
f"--output={efi_file_tmp_path}",
|
||||||
f"boot/grub/grub.cfg"
|
f"boot/grub/grub.cfg"
|
||||||
]
|
]
|
||||||
try:
|
try:
|
||||||
logger.debug(f" => Creating EFI/BOOT directory in: {os.path.join(grub_efi_tmpdir, 'EFI', 'BOOT')}")
|
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)
|
subprocess.run(["mkdir", "-p", os.path.join(grub_efi_tmpdir, "EFI", "BOOT")], check=True)
|
||||||
|
@ -100,9 +100,9 @@ def iso_generator_main(
|
|||||||
logging.info("=> Generating ISO image with xorriso...")
|
logging.info("=> Generating ISO image with xorriso...")
|
||||||
xorriso_command = [
|
xorriso_command = [
|
||||||
"xbps-uchroot",
|
"xbps-uchroot",
|
||||||
"--",
|
|
||||||
paths['PEPHOSTDIR'],
|
paths['PEPHOSTDIR'],
|
||||||
"/usr/bin/xorriso",
|
"/usr/bin/xorriso",
|
||||||
|
"--",
|
||||||
"-as", "mkisofs",
|
"-as", "mkisofs",
|
||||||
"-iso-level", "3",
|
"-iso-level", "3",
|
||||||
"-rock",
|
"-rock",
|
||||||
|
@ -98,9 +98,9 @@ def create_squashfs_image(rootfs_dir, squashfs_output_file, pep_host_dir, logger
|
|||||||
os.makedirs(output_dir, exist_ok=True)
|
os.makedirs(output_dir, exist_ok=True)
|
||||||
mksquashfs_command = [
|
mksquashfs_command = [
|
||||||
"xbps-uchroot",
|
"xbps-uchroot",
|
||||||
"--",
|
|
||||||
pep_host_dir,
|
pep_host_dir,
|
||||||
"/usr/bin/mksquashfs",
|
"/usr/bin/mksquashfs",
|
||||||
|
"--",
|
||||||
os.path.join(build_dir, "tmp"),
|
os.path.join(build_dir, "tmp"),
|
||||||
squashfs_output_file,
|
squashfs_output_file,
|
||||||
"-comp", "zstd",
|
"-comp", "zstd",
|
||||||
|
Loading…
Reference in New Issue
Block a user