Add: Bootmodes

Author: Hayao0819

alteriso5/cmd/build/build.go

@@ -26,6 +26,7 @@ func build() error {
 	profile := config.Profile{
 		Base:       path.Join(current, "profile"),
 		InstallDir: "alter",
+		BootModes:  []string{"SysLinux"},
 	}
 
 	// TODO: Add more targets

alteriso5/cmd/build/config/profile.go

@@ -3,6 +3,7 @@ package config
 type Profile struct {
 	Base       string
 	InstallDir string
+	BootModes  []string
 }
 
 func ReadProfile(path string) (Profile, error) {

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

@@ -0,0 +1,22 @@
+package boot
+
+func GetModesByName(targets ...string) []*Mode {
+	modes := []*Mode{}
+	for _, t := range targets {
+		m := getModeByName(t)
+		if m != nil {
+			modes = append(modes, m)
+		}
+	}
+	return modes
+}
+
+func Setup(modes *[]*Mode) error {
+	for _, m := range *modes {
+		m.setupXorriso()
+		if err := m.install(); err != nil {
+			return err
+		}
+	}
+	return nil
+}

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

@@ -0,0 +1,24 @@
+package boot
+
+type Mode struct {
+	name         string
+	install      func() error
+	setupXorriso func()
+}
+
+func (m *Mode) SetInstall(f func() error) {
+	m.install = f
+}
+
+var AllModes []*Mode = []*Mode{
+	SysLinux,
+}
+
+func getModeByName(name string) *Mode {
+	for _, m := range AllModes {
+		if m.name == name {
+			return m
+		}
+	}
+	return nil
+}

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

@@ -0,0 +1,9 @@
+package boot
+
+var SysLinux *Mode = &Mode{
+	name: "SysLinux",
+	setupXorriso: func() {
+		Xorriso.setArgsForSysLinuxElTorito()
+		Xorriso.setArgsForSysLinuxMBRBios()
+	},
+}

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

@@ -0,0 +1,32 @@
+package boot
+
+import (
+	"path"
+)
+
+// SysLinux MBR El Torito
+func (o *xorriso) setArgsForSysLinuxElTorito() {
+	arg := xorrisoArg{
+		name: "SysLinuxEltorito",
+	}
+
+	arg.add("-eltorito-boot", "boot/syslinux/isolinux.bin")
+	arg.add("-eltorito-catalog", "boot/syslinux/boot.cat")
+	arg.add("-no-emul-boot", "-boot-load-size", "4", "-boot-info-table")
+
+	o.addArg(&arg)
+}
+
+func (o *xorriso) setArgsForSysLinuxMBRBios() {
+
+	arg := xorrisoArg{
+		name: "SysLinuxMBRBios",
+	}
+
+	arg.add("-isohybrid-mbr", path.Join(o.fsDir, "boot", "syslinux", "isohqpfx.bin"))
+	arg.add("--mbr-force-bootable")
+	arg.add("-partition_offset", "16")
+
+	o.addArg(&arg)
+
+}

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

@@ -0,0 +1,81 @@
+package boot
+
+import (
+	"os"
+	"os/exec"
+)
+
+var Xorriso = xorriso{}
+
+type xorriso struct {
+	fsDir string
+	out   string
+	args  []*xorrisoArg
+}
+
+type xorrisoArg struct {
+	name string
+	args *[]string
+}
+
+func (xa *xorrisoArg) add(args ...string) {
+	arg := append(*(xa.args), args...)
+	xa.args = &arg
+}
+
+func (x *xorriso) hasArg(a *xorrisoArg) bool {
+	for _, x := range x.args {
+		if x.name == a.name {
+			return true
+		}
+	}
+	return false
+}
+
+func (o *xorriso) addArg(arg *xorrisoArg) {
+	if !o.hasArg(arg) {
+		o.args = append(o.args, arg)
+	}
+}
+
+func (o *xorriso) defaultArgs() *xorrisoArg {
+	d := []string{
+		"-as", "mkisofs",
+		"-iso-level", "3",
+		"-full-iso9660-filenames",
+		"-joliet",
+		"-joliet-long",
+		"-rational-rock",
+		"--output", o.out,
+		o.fsDir,
+	}
+	return &xorrisoArg{
+		name: "default",
+		args: &d,
+	}
+}
+
+func (x *xorriso) Args() *[]string {
+	args := []string{}
+	for _, a := range x.args {
+		args = append(args, *a.args...)
+	}
+
+	def := x.defaultArgs()
+	args = append(args, *def.args...)
+	return &args
+}
+
+func (x *xorriso) Build(dir string, out string) error {
+	x.fsDir = dir
+	x.out = out
+
+	args := x.Args()
+
+	cmd := exec.Command("xorriso", *args...)
+	cmd.Stdout = os.Stdout
+	cmd.Stdin = os.Stdin
+	cmd.Stderr = os.Stderr
+
+	return cmd.Run()
+}

alteriso5/cmd/build/work/tasks.go

@@ -5,8 +5,8 @@ import (
 	"path"
 
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/airootfs"
+	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/boot"
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/chroot"
-	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/xorriso"
 	"github.com/FascodeNet/alterlinux/alteriso5/utils"
 	cp "github.com/otiai10/copy"
 )
@@ -69,14 +69,12 @@ var makeAirootfs *BuildTask = NewBuildTask("makeAirootfs", func(w *Work) error {
 })
 
 var makeBoot *BuildTask = NewBuildTask("makeBoot", func(w *Work) error {
-	// TODO: ISO以外もサポートする
 
-	opt := xorriso.Options{
-		SysLinux: true,
-	}
-
-	isodir := path.Join(w.Base, "iso")
+	boot.SysLinux.SetInstall(func() error {
+		return nil
+	})
 
-	return xorriso.Build(isodir, w.target.Out, &opt)
+	modes := boot.GetModesByName(w.profile.BootModes...)
+	return boot.Setup(&modes)
 
 })

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

@@ -0,0 +1,3 @@
+{
+    "bootmodes": ["SysLinux"]
+}