Update: Add profile reader

Author: Hayao0819

alteriso5/cmd/build/cmd.go

@@ -1,7 +1,6 @@
 package build
 
 import (
-	"fmt"
 	"os"
 	"path"
 
@@ -16,11 +15,12 @@ func Cmd() *cobra.Command {
 	cmd := cobra.Command{
 		Use:   "build",
 		Short: "Build an ISO image",
+		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 
 			// Handle signals
 			utils.OnSignal(func(s os.Signal) {
-				fmt.Println("Received signal:", s)
+				cmd.Println("Received signal:", s)
 				os.Exit(1)
 			}, os.Interrupt)
 
@@ -44,15 +44,14 @@ func Cmd() *cobra.Command {
 			}
 
 			// Dummy profile
-			profile := config.Profile{
-				Base:       path.Join(current, "profile"),
-				InstallDir: "alter",
-				BootModes:  []string{"SysLinux"},
+			profile, err := config.ReadProfile(args[0])
+			if err != nil {
+				return err
 			}
 
 			// TODO: Add more targets
 			target := config.NewTarget("x86_64", outDir)
-			return work.Build(profile, target, cmd)
+			return work.Build(*profile, target, cmd)
 
 		},
 	}

alteriso5/cmd/build/config/profile.go

@@ -1,11 +1,36 @@
 package config
 
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"path"
+)
+
 type Profile struct {
 	Base       string
-	InstallDir string
-	BootModes  []string
+	InstallDir string   `json:"install_dir"`
+	BootModes  []string `json:"bootmodes"`
+	ISOName    string   `json:"iso_name"`
+	ISOLabel   string   `json:"iso_label"`
 }
 
-func ReadProfile(path string) (Profile, error) {
-	return Profile{}, nil
+func ReadProfile(dir string) (*Profile, error) {
+
+	data, err := os.ReadFile(path.Join(dir, "profiledef.json"))
+	if err != nil {
+		return nil, err
+	}
+
+	new := Profile{
+		Base: dir,
+	}
+
+	if err := json.Unmarshal(data, &new); err != nil {
+		return nil, err
+	}
+
+	fmt.Println(new)
+
+	return &new, nil
 }

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

@@ -7,7 +7,8 @@ import (
 // SysLinux MBR El Torito
 func (o *xorriso) SetArgsForSysLinuxElTorito() {
 	arg := xorrisoArg{
-		name: "SysLinuxEltorito",
+		name:     "SysLinuxEltorito",
+		bootMode: "SysLinux",
 	}
 
 	arg.add("-eltorito-boot", "boot/syslinux/isolinux.bin")
@@ -20,7 +21,8 @@ func (o *xorriso) SetArgsForSysLinuxElTorito() {
 func (o *xorriso) SetArgsForSysLinuxMBRBios() {
 
 	arg := xorrisoArg{
-		name: "SysLinuxMBRBios",
+		name:     "SysLinuxMBRBios",
+		bootMode: "SysLinux",
 	}
 
 	arg.add("-isohybrid-mbr", path.Join(o.fsDir, "boot", "syslinux", "isohqpfx.bin"))
@@ -30,3 +32,8 @@ func (o *xorriso) SetArgsForSysLinuxMBRBios() {
 	o.addArg(&arg)
 
 }
+
+func init() {
+	Xorriso.SetArgsForSysLinuxElTorito()
+	Xorriso.SetArgsForSysLinuxMBRBios()
+}

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

@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/exec"
 	"path"
+	"slices"
 )
 
 var Xorriso = xorriso{}
@@ -16,8 +17,9 @@ type xorriso struct {
 }
 
 type xorrisoArg struct {
-	name string
-	args *[]string
+	name     string
+	bootMode string
+	args     *[]string
 }
 
 func (xa *xorrisoArg) add(args ...string) {
@@ -65,22 +67,24 @@ func (o *xorriso) preArgs() *xorrisoArg {
 	}
 }
 
-func (x *xorriso) Args() *[]string {
+func (x *xorriso) Args(bootmode ...string) *[]string {
 	args := []string{}
 	pre := x.preArgs()
 	args = append(args, *pre.args...)
 	for _, a := range x.args {
-		args = append(args, *a.args...)
+		if slices.Contains(bootmode, a.bootMode) {
+			args = append(args, *a.args...)
+		}
 	}
 
 	return &args
 }
 
-func (x *xorriso) Build(dir string, out string) error {
+func (x *xorriso) Build(dir string, out string, bootmode ...string) error {
 	x.fsDir = dir
 	x.out = out
 
-	args := x.Args()
+	args := x.Args(bootmode...)
 
 	cmd := exec.Command("xorriso", *args...)
 	cmd.Stdout = os.Stdout

alteriso5/cmd/build/work/task-bootmodes.go

@@ -7,6 +7,7 @@ import (
 	"github.com/FascodeNet/alterlinux/alteriso5/utils"
 )
 
+// SysLinux
 var makeSysLinux = NewBuildTask("makeSysLinux", func(w Work) error {
 
 	slog.Debug("Setting up SYSLINUX for BIOS booting from a disk...")
@@ -68,6 +69,7 @@ var makeSysLinux = NewBuildTask("makeSysLinux", func(w Work) error {
 	return nil
 })
 
+// Run each bootmodes
 var makeBootModes *BuildTask = NewBuildTask("makeBootModes", func(w Work) error {
 	return w.RunOnce(makeSysLinux)
 })

alteriso5/cmd/build/work/task-init.go

@@ -1,7 +1,11 @@
 package work
 
 import (
+	"log/slog"
+	"path"
+
 	"github.com/FascodeNet/alterlinux/alteriso5/utils"
+	cp "github.com/otiai10/copy"
 )
 
 var makeBaseDirs *BuildTask = NewBuildTask("makeBaseDirs",
@@ -18,6 +22,20 @@ var makeBaseDirs *BuildTask = NewBuildTask("makeBaseDirs",
 		return nil
 	})
 
+var makeCustomAirootfs *BuildTask = NewBuildTask("makeCustomAirootfs", func(w Work) error {
+	slog.Info("Copying custom airootfs files...")
+	profileAirootfsDir := path.Join(w.profile.Base, "airootfs")
+
+	if err := cp.Copy(profileAirootfsDir, w.GetDirs().Pacstrap, cp.Options{
+		PreserveOwner: true,
+		Sync:          true,
+	}); err != nil {
+		return err
+	}
+
+	return nil
+})
+
 var makeChroot *BuildTask = NewBuildTask("makeChroot", func(work Work) error {
 
 	env, err := work.GetChroot()

alteriso5/cmd/build/work/task-outfiles.go

@@ -3,8 +3,5 @@ package work
 import "github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/boot"
 
 var makeOutFiles *BuildTask = NewBuildTask("makeOutFiles", func(w Work) error {
-	boot.Xorriso.SetArgsForSysLinuxElTorito()
-	boot.Xorriso.SetArgsForSysLinuxElTorito()
-
-	return boot.Xorriso.Build(w.GetDirs().Iso, w.target.Out)
+	return boot.Xorriso.Build(w.GetDirs().Iso, w.target.Out, w.profile.BootModes...)
 })

build.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
-
-script_path=$(cd "$(dirname "${0}")" || exit 1; pwd)
-go run "${script_path}/alteriso5/main.go" "$@"
+script_path=$(
+    cd "$(dirname "${0}")" || exit 1
+    pwd
+)
+go run "${script_path}/alteriso5/main.go" build "$script_path/profile"

profile/profiledef.json

@@ -1,3 +1,4 @@
 {
+    "install_dir": "alter",
     "bootmodes": ["SysLinux"]
 }