Update: Rename chroot Env

Author: Hayao0819

alteriso5/cmd/build/work/airootfs/chroot.go

@@ -10,14 +10,14 @@ import (
 	"github.com/FascodeNet/alterlinux/alteriso5/utils"
 )
 
-type Env struct {
+type Chroot struct {
 	Arch       string
 	Dir        string
 	initilized bool
 }
 
-func New(dir, arch string) (*Env, error) {
-	env := Env{
+func GetChrootDir(dir, arch string) (*Chroot, error) {
+	env := Chroot{
 		Arch: arch,
 		Dir:  dir,
 	}
@@ -35,7 +35,7 @@ func New(dir, arch string) (*Env, error) {
 	return &env, nil
 }
 
-func (e *Env) Init() error {
+func (e *Chroot) Init() error {
 	if err := os.MkdirAll(e.Dir, 0755); err != nil {
 		return err
 	}
@@ -56,7 +56,7 @@ func (e *Env) Init() error {
 	return nil
 }
 
-func (e *Env) FindKernels() ([]string, error) {
+func (e *Chroot) FindKernels() ([]string, error) {
 	kernels := []string{}
 
 	//bootDir := path.Join(e.Dir, "boot")

alteriso5/cmd/build/work/buildtask.go

@@ -2,10 +2,11 @@ package work
 
 type BuildTask struct {
 	name string
-	task func(work *Work) error
+	task func(work Work) error
 }
 
-func NewBuildTask(name string, task func(*Work) error) *BuildTask {
+
+func NewBuildTask(name string, task func(Work) error) *BuildTask {
 	return &BuildTask{
 		name: name,
 		task: task,
@@ -17,5 +18,5 @@ func (t *BuildTask) Name() string {
 }
 
 func (t *BuildTask) Run(w *Work) error {
-	return t.task(w)
+	return t.task(*w)
 }

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

@@ -7,7 +7,7 @@ import (
 	"github.com/FascodeNet/alterlinux/alteriso5/utils"
 )
 
-var makeSysLinux = NewBuildTask("makeSysLinux", func(w *Work) error {
+var makeSysLinux = NewBuildTask("makeSysLinux", func(w Work) error {
 
 	slog.Debug("Setting up SYSLINUX for BIOS booting from a disk...")
 	dirs := w.GetDirs()
@@ -24,6 +24,7 @@ var makeSysLinux = NewBuildTask("makeSysLinux", func(w *Work) error {
 			Source: biosFilesDir,
 			Dest:   isoSyslinuxDir,
 			Skip:   utils.OnlySpecificExtention(".c32"),
+			Perm:   0644,
 		},
 		{
 			Source: dirs.SyslinuxConfig,
@@ -39,14 +40,31 @@ var makeSysLinux = NewBuildTask("makeSysLinux", func(w *Work) error {
 		},
 	}
 
+	chroot, err := w.GetChroot()
+	if err != nil {
+		return err
+	}
+	kernels, err := chroot.FindKernels()
+	if err != nil {
+		return err
+	}
+
+	for _, kernel := range kernels {
+		cpFiles = append(cpFiles, utils.CopyTask{
+			Source: kernel,
+			Dest:   path.Join(isoSyslinuxDir, path.Base(kernel)),
+			Perm:   0644,
+		})
+
+	}
+
 	if err := utils.CopyAll(cpFiles...); err != nil {
 		return err
 	}
 
 	return nil
 })
 
-var makeBootModes *BuildTask = NewBuildTask("makeBootModes", func(w *Work) error {
-
+var makeBootModes *BuildTask = NewBuildTask("makeBootModes", func(w Work) error {
 	return w.RunOnce(makeSysLinux)
 })

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

@@ -1,12 +1,11 @@
 package work
 
 import (
-	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/airootfs"
 	"github.com/FascodeNet/alterlinux/alteriso5/utils"
 )
 
 var makeBaseDirs *BuildTask = NewBuildTask("makeBaseDirs",
-	func(work *Work) error {
+	func(work Work) error {
 
 		dirs := []string{
 			work.Base,
@@ -19,11 +18,12 @@ var makeBaseDirs *BuildTask = NewBuildTask("makeBaseDirs",
 		return nil
 	})
 
-var makeChroot *BuildTask = NewBuildTask("makeChroot", func(work *Work) error {
+var makeChroot *BuildTask = NewBuildTask("makeChroot", func(work Work) error {
 
-	env, err := airootfs.New(work.GetDirs().Pacstrap, work.target.Arch)
+	env, err := work.GetChroot()
 	if err != nil {
 		return err
+
 	}
 	if err := env.Init(); err != nil {
 		return err

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

@@ -2,8 +2,7 @@ package work
 
 import "github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/boot"
 
-var makeOutFiles *BuildTask = NewBuildTask("makeOutFiles", func(w *Work) error {
-
+var makeOutFiles *BuildTask = NewBuildTask("makeOutFiles", func(w Work) error {
 	boot.Xorriso.SetArgsForSysLinuxElTorito()
 	boot.Xorriso.SetArgsForSysLinuxElTorito()
 

alteriso5/cmd/build/work/tasks.go

@@ -7,7 +7,7 @@ import (
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/airootfs"
 )
 
-var makeAirootfs *BuildTask = NewBuildTask("makeAirootfs", func(w *Work) error {
+var makeAirootfs *BuildTask = NewBuildTask("makeAirootfs", func(w Work) error {
 
 	slog.Debug("Copying profile to airootfs...")
 	airootfsDir := path.Join(w.Base, w.target.Arch, "airootfs")

alteriso5/cmd/build/work/work.go

@@ -1,10 +1,12 @@
 package work
 
 import (
+	"log/slog"
 	"os"
 	"path"
 
 	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/config"
+	"github.com/FascodeNet/alterlinux/alteriso5/cmd/build/work/airootfs"
 	"github.com/Hayao0819/nahi/osutils"
 	"github.com/spf13/cobra"
 )
@@ -38,9 +40,15 @@ func (w *Work) GetDirs() *dirs {
 	}
 }
 
+func (w *Work) GetChroot() (*airootfs.Chroot, error) {
+	return airootfs.GetChrootDir(w.GetDirs().Pacstrap, w.target.Arch)
+	
+}
+
 func (w *Work) RunOnce(task *BuildTask) error {
 	lp := path.Join(w.Base, w.target.Arch, "lockfile", task.Name())
 	if osutils.Exists(lp) {
+		slog.Warn("This task has already runned", "name", task.Name())
 		return nil
 	}