Update: Bootmode pointer

Author: Hayao0819

alteriso5/config/profile.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"os"
 	"path"
+	"slices"
 
 	"github.com/FascodeNet/alterlinux/alteriso5/config/pkg"
 	"github.com/FascodeNet/alterlinux/alteriso5/work/boot"
@@ -13,7 +14,7 @@ type Profile struct {
 	Base             string
 	InstallDir       string   `json:"install_dir"`
 	BootModesStr     []string `json:"bootmodes"`
-	BootModes        []boot.Mode
+	BootModes        []*boot.Mode
 	ISOName          string `json:"iso_name"`
 	ISOLabel         string `json:"iso_label"`
 	UseAlterSysLinux bool   `json:"use_alter_syslinux"`
@@ -46,3 +47,7 @@ func ReadProfile(dir string) (*Profile, error) {
 func (p *Profile) GetPkgList(arch string) ([]string, error) {
 	return pkg.GetPkgList(p.Base, arch)
 }
+
+func (p *Profile) HasBootMode(b *boot.Mode) bool {
+	return slices.Contains(p.BootModesStr, b.String())
+}

alteriso5/work/boot/bootmode.go

@@ -8,18 +8,18 @@ type Mode struct {
 }
 
 var (
-	BiosSyslinuxMbr             Mode = Mode{"bios.syslinux.mbr", nil}
-	BiosSyslinuxElTorito        Mode = Mode{"bios.syslinux.eltorito", nil}
-	UefiIa32SystemdBootEsp      Mode = Mode{"uefi-ia32.systemd-boot.esp", nil}
-	UefiX64SystemdBootEsp       Mode = Mode{"uefi-x64.systemd-boot.esp", nil}
-	UefiIa32SystemdBootElTorito Mode = Mode{"uefi-ia32.systemd-boot.eltorito", nil}
-	UefiX64SystemdBootElTorito  Mode = Mode{"uefi-x64.systemd-boot.eltorito", nil}
-	UefiX64GrubEsp              Mode = Mode{"uefi-x64.grub.esp", nil}
-	UefiIa32GrubEsp             Mode = Mode{"uefi-ia32.grub.esp", nil}
-	UefiX64GrubElTorito         Mode = Mode{"uefi-x64.grub.eltorito", nil}
-	UefiIa32GrubElTorito        Mode = Mode{"uefi-ia32.grub.eltorito", nil}
+	BiosSyslinuxMbr             *Mode = &Mode{"bios.syslinux.mbr", nil}
+	BiosSyslinuxElTorito        *Mode = &Mode{"bios.syslinux.eltorito", nil}
+	UefiIa32SystemdBootEsp      *Mode = &Mode{"uefi-ia32.systemd-boot.esp", nil}
+	UefiX64SystemdBootEsp       *Mode = &Mode{"uefi-x64.systemd-boot.esp", nil}
+	UefiIa32SystemdBootElTorito *Mode = &Mode{"uefi-ia32.systemd-boot.eltorito", nil}
+	UefiX64SystemdBootElTorito  *Mode = &Mode{"uefi-x64.systemd-boot.eltorito", nil}
+	UefiX64GrubEsp              *Mode = &Mode{"uefi-x64.grub.esp", nil}
+	UefiIa32GrubEsp             *Mode = &Mode{"uefi-ia32.grub.esp", nil}
+	UefiX64GrubElTorito         *Mode = &Mode{"uefi-x64.grub.eltorito", nil}
+	UefiIa32GrubElTorito        *Mode = &Mode{"uefi-ia32.grub.eltorito", nil}
 
-	Modes = []Mode{
+	Modes = []*Mode{
 		BiosSyslinuxMbr,
 		BiosSyslinuxElTorito,
 		UefiIa32SystemdBootEsp,
@@ -46,17 +46,17 @@ func (m *Mode) Validate() error {
 
 var ErrInvalidMode = errors.New("invalid boot mode")
 
-func getModeFromStr(mode string) (Mode, error) {
+func getModeFromStr(mode string) (*Mode, error) {
 	for _, m := range Modes {
 		if m.name == mode {
 			return m, nil
 		}
 	}
-	return Mode{}, ErrInvalidMode
+	return nil, ErrInvalidMode
 }
 
-func GetModes(modes ...string) ([]Mode, error) {
-	r := []Mode{}
+func GetModes(modes ...string) ([]*Mode, error) {
+	r := []*Mode{}
 	for _, mode := range modes {
 		m, err := getModeFromStr(mode)
 		if err != nil {

alteriso5/work/boot/xorriso.go

@@ -15,15 +15,15 @@ type xorriso struct {
 }
 
 type xorrisoArg struct {
-	bootMode Mode
+	bootMode *Mode
 	args     func(o *xorriso) []string
 }
 
 func (x *xorriso) addArgs(arg ...*xorrisoArg) {
 	x.args = append(x.args, arg...)
 }
 
-func (x *xorriso) Args(bootmode ...Mode) *[]string {
+func (x *xorriso) Args(bootmode ...*Mode) *[]string {
 	var args []string
 
 	args = append(args, xorrisoCommonArgs.args(x)...)
@@ -38,7 +38,7 @@ func (x *xorriso) Args(bootmode ...Mode) *[]string {
 	return &args
 }
 
-func (x *xorriso) Build(dir string, out string, bootmode ...Mode) error {
+func (x *xorriso) Build(dir string, out string, bootmode ...*Mode) error {
 	x.fsDir = dir
 	x.out = out