FIx: Fix xorriso arguments

Author: Hayao0819

alteriso5/cmd/build/work/boot/xorriso.go

@@ -1,6 +1,7 @@
 package boot
 
 import (
+	"fmt"
 	"os"
 	"os/exec"
 	"path"
@@ -43,11 +44,12 @@ func (o *xorriso) addArg(arg *xorrisoArg) {
 	}
 }
 
-func (o *xorriso) defaultArgs() *xorrisoArg {
+func (o *xorriso) preArgs() *xorrisoArg {
 
 	out := path.Join(o.out, "alterlinux.iso")
 
 	d := []string{
+		"-no_rc",
 		"-as", "mkisofs",
 		"-iso-level", "3",
 		"-full-iso9660-filenames",
@@ -58,19 +60,19 @@ func (o *xorriso) defaultArgs() *xorrisoArg {
 		o.fsDir,
 	}
 	return &xorrisoArg{
-		name: "default",
+		name: "pre",
 		args: &d,
 	}
 }
 
 func (x *xorriso) Args() *[]string {
 	args := []string{}
+	pre := x.preArgs()
+	args = append(args, *pre.args...)
 	for _, a := range x.args {
 		args = append(args, *a.args...)
 	}
 
-	def := x.defaultArgs()
-	args = append(args, *def.args...)
 	return &args
 }
 
@@ -85,5 +87,7 @@ func (x *xorriso) Build(dir string, out string) error {
 	cmd.Stdin = os.Stdin
 	cmd.Stderr = os.Stderr
 
+	fmt.Println(*args)
+
 	return cmd.Run()
 }

alteriso5/cmd/build/work/tasks.go

@@ -48,7 +48,6 @@ var makeBootModes *BuildTask = NewBuildTask("makeBootModes", func(w *Work) error
 			return err
 		}
 
-
 		biosFilesDir := path.Join(dirs.Pacstrap, "usr", "lib", "syslinux", "bios")
 		cpFiles := []utils.CopyTask{
 			{
@@ -62,21 +61,18 @@ var makeBootModes *BuildTask = NewBuildTask("makeBootModes", func(w *Work) error
 			},
 			{
 				Source: path.Join(biosFilesDir, "lpxelinux.0"),
-				Dest:  path.Join(isoSyslinuxDir, "lpxelinux.0"),
+				Dest:   path.Join(isoSyslinuxDir, "lpxelinux.0"),
 			},
 			{
 				Source: path.Join(biosFilesDir, "memdisk"),
-				Dest:  path.Join(isoSyslinuxDir, "memdisk"),
+				Dest:   path.Join(isoSyslinuxDir, "memdisk"),
 			},
 		}
 
 		if err := utils.CopyAll(cpFiles...); err != nil {
 			return err
 		}
 
-		boot.Xorriso.SetArgsForSysLinuxElTorito()
-		boot.Xorriso.SetArgsForSysLinuxElTorito()
-
 		return nil
 	})
 
@@ -98,5 +94,9 @@ var makeAirootfs *BuildTask = NewBuildTask("makeAirootfs", func(w *Work) error {
 })
 
 var makeOutFiles *BuildTask = NewBuildTask("makeOutFiles", func(w *Work) error {
-	return boot.Xorriso.Build(w.Base, w.target.Out)
+
+	boot.Xorriso.SetArgsForSysLinuxElTorito()
+	boot.Xorriso.SetArgsForSysLinuxElTorito()
+
+	return boot.Xorriso.Build(w.GetDirs().Iso, w.target.Out)
 })