web/patches/distrobuilder-mkisofs.patch
2023-10-25 16:36:53 +02:00

47 lines
2.2 KiB
Diff

From 91ab435f54d1665e5f5c0497568ae7985c6b8b38 Mon Sep 17 00:00:00 2001
From: rick <rick@gnous.eu>
Date: Wed, 25 Oct 2023 15:49:14 +0200
Subject: [PATCH] change genisoimage for mkisofs
---
distrobuilder/main_repack-windows.go | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/distrobuilder/main_repack-windows.go b/distrobuilder/main_repack-windows.go
index 76735f2..cbeae34 100644
--- a/distrobuilder/main_repack-windows.go
+++ b/distrobuilder/main_repack-windows.go
@@ -327,17 +327,17 @@ func (c *cmdRepackWindows) run(cmd *cobra.Command, args []string, overlayDir str
logger.Info("Generating new ISO")
var stdout strings.Builder
- err = shared.RunCommand(c.global.ctx, nil, &stdout, "genisoimage", "--version")
+ err = shared.RunCommand(c.global.ctx, nil, &stdout, "mkisofs", "--version")
if err != nil {
- return fmt.Errorf("Failed to determine version of genisoimage: %w", err)
+ return fmt.Errorf("Failed to determine version of mkisofs: %w", err)
}
version := strings.Split(stdout.String(), "\n")[0]
if strings.HasPrefix(version, "mkisofs") {
- err = shared.RunCommand(c.global.ctx, nil, nil, "genisoimage", "-iso-level", "3", "-l", "-no-emul-boot", "-b", "efi/microsoft/boot/efisys.bin", "-o", args[1], overlayDir)
+ err = shared.RunCommand(c.global.ctx, nil, nil, "mkisofs", "-iso-level", "3", "-l", "-no-emul-boot", "-b", "efi/microsoft/boot/efisys.bin", "-o", args[1], overlayDir)
} else {
- err = shared.RunCommand(c.global.ctx, nil, nil, "genisoimage", "--allow-limited-size", "-l", "-no-emul-boot", "-b", "efi/microsoft/boot/efisys.bin", "-o", args[1], overlayDir)
+ err = shared.RunCommand(c.global.ctx, nil, nil, "mkisofs", "-l", "-no-emul-boot", "-b", "efi/microsoft/boot/efisys.bin", "-o", args[1], overlayDir)
}
if err != nil {
@@ -413,7 +413,7 @@ func (c *cmdRepackWindows) modifyWim(path string, index int) error {
}
func (c *cmdRepackWindows) checkDependencies() error {
- dependencies := []string{"genisoimage", "hivexregedit", "rsync", "wimlib-imagex"}
+ dependencies := []string{"mkisofs", "hivexregedit", "rsync", "wimlib-imagex"}
for _, dep := range dependencies {
_, err := exec.LookPath(dep)
--
2.42.0