Add: Setup efibootimg

Author: Hayao0819

alteriso5/data/efiboot/loader/entries/01-archiso.conf

@@ -0,0 +1,7 @@
+title    Arch Linux install medium (x86_64, UEFI)
+sort-key 01
+linux    /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux
+initrd   /%INSTALL_DIR%/boot/intel-ucode.img
+initrd   /%INSTALL_DIR%/boot/amd-ucode.img
+initrd   /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
+options  archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%

alteriso5/data/efiboot/loader/loader.conf

@@ -0,0 +1,3 @@
+timeout 15
+default 01-archiso.conf
+beep on

alteriso5/utils/exec.go

@@ -0,0 +1,14 @@
+package utils
+
+import (
+	"path"
+	"strings"
+)
+
+func Slash(elem ...string) string {
+	arg := []string{}
+	for _, p := range elem {
+		arg = append(arg, strings.Split(p, "/")...)
+	}
+	return path.Join(arg...)
+}

alteriso5/utils/path.go

@@ -0,0 +1,15 @@
+package boot
+
+type EfibootConf struct {
+	Base string
+}
+
+func ReadEfibootConf(dir string) (*EfibootConf, error) {
+	return &EfibootConf{
+		Base: dir,
+	}, nil
+}
+
+func (e *EfibootConf) ParseAndBuild(data any, out string) error {
+	return nil
+}

alteriso5/work/boot/efibootconf.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log/slog"
 
-	"github.com/FascodeNet/alterlinux/alteriso5/utils"
+	"github.com/Hayao0819/nahi/exutils"
 )
 
 func byteToKib(b int64) int64 {
@@ -20,12 +20,12 @@ func MakeEfiBootImg(dest string, size int64) error {
 	sizeMib := mibToKiB((byteToKib(size) + 1024) / 1024)
 	slog.Debug("Creating EFI boot image...", "dest", dest, "size", sizeMib)
 
-	mkfs := utils.CommandWithStdio("mkfs.fat", "-C", "-n", "ALTERISOEFI", dest, fmt.Sprint(sizeMib))
+	mkfs := exutils.CommandWithStdio("mkfs.fat", "-C", "-n", "ALTERISOEFI", dest, fmt.Sprint(sizeMib))
 	if err := mkfs.Run(); err != nil {
 		return err
 	}
 
-	mmd := utils.CommandWithStdio("mmd", "-i", dest, "::/EFI", "::/EFI/BOOT")
+	mmd := exutils.CommandWithStdio("mmd", "-i", dest, "::/EFI", "::/EFI/BOOT")
 	if err := mmd.Run(); err != nil {
 		return err
 	}

alteriso5/work/boot/efibootimg.go

@@ -17,6 +17,12 @@ func (work Work) Build(p config.Profile, t config.Target, c *cobra.Command) erro
 	}
 	work.Dirs = dirs
 
+	files, err := work.GetFiles()
+	if err != nil {
+		return err
+	}
+	work.Files = files
+
 	tasks := []*BuildTask{
 		validate,
 		makeBaseDirs,

alteriso5/work/build.go

@@ -5,8 +5,10 @@ import (
 	"os"
 	"path"
 
+	"github.com/FascodeNet/alterlinux/alteriso5/utils"
 	"github.com/FascodeNet/alterlinux/alteriso5/work/boot"
 	"github.com/Hayao0819/nahi/cputils"
+	"github.com/Hayao0819/nahi/exutils"
 	osutils "github.com/Hayao0819/nahi/futils"
 )
 
@@ -23,18 +25,18 @@ var makeCommonSystemdBoot *BuildTask = NewBuildTask("makeCommonSystemdBoot", fun
 		// For UEFI x64
 		if w.profile.HasBootMode(boot.UefiX64SystemdBootEsp) || w.profile.HasBootMode(boot.UefiX64SystemdBootElTorito) {
 			efiboot_files = append(efiboot_files,
-				path.Join(w.Dirs.Pacstrap, "usr", "lib", "systemd", "boot", "efi", "systemd-bootx64.efi"),
-				path.Join(w.Dirs.Pacstrap, "usr", "share", "edk2-shell", "x64", "Shell_Full.efi"),
-				path.Join(w.Dirs.Pacstrap, "boot", "memtest86+", "memtest.efi"),
-				path.Join(w.Dirs.Pacstrap, "usr", "share", "licenses", "spdx", "GPL-2.0-only.txt"),
+				utils.Slash(w.Dirs.Pacstrap, "/usr/lib/systemd/boot/efi/systemd-bootx64.efi"),
+				utils.Slash(w.Dirs.Pacstrap, "/usr/share/edk2-shell/x64/Shell_Full.efi"),
+				utils.Slash(w.Dirs.Pacstrap, "/boot/memtest86+/memtest.efi"),
+				utils.Slash(w.Dirs.Pacstrap, "/usr/share/licenses/spdx/GPL-2.0-only.txt"),
 			)
 		}
 
 		// For UEFI ia32
 		if w.profile.HasBootMode(boot.UefiIa32SystemdBootEsp) || w.profile.HasBootMode(boot.UefiIa32SystemdBootElTorito) {
 			efiboot_files = append(efiboot_files,
-				path.Join(w.Dirs.Pacstrap, "usr", "lib", "systemd", "boot", "efi", "systemd-bootia32.efi"),
-				path.Join(w.Dirs.Pacstrap, "usr", "share", "edk2-shell", "ia32", "Shell_Full.efi"),
+				utils.Slash(w.Dirs.Pacstrap, "/usr/lib/systemd/boot/efi/systemd-bootia32.efi"),
+				utils.Slash(w.Dirs.Pacstrap, "/usr/share/edk2-shell/ia32/Shell_Full.efi"),
 			)
 		}
 
@@ -70,10 +72,10 @@ var makeCommonSystemdBoot *BuildTask = NewBuildTask("makeCommonSystemdBoot", fun
 	}
 
 	// For efiboot files
-	if err := os.MkdirAll(path.Join(w.Base, w.target.Arch, "efiboot"), 0755); err != nil {
+	if err := os.MkdirAll(w.Dirs.Efiboot, 0755); err != nil {
 		return err
 	}
-	sizes, err := osutils.GetFileSizesInDir(path.Join(w.Base, w.target.Arch, "efiboot"))
+	sizes, err := osutils.GetFileSizesInDir(w.Dirs.Efiboot)
 	if err != nil {
 		return err
 	}
@@ -118,7 +120,8 @@ var makeCommonSystemdBootConfigIsofs *BuildTask = NewBuildTask("makeCommonSystem
 var makeCommonSystemdBootConfigEsp *BuildTask = NewBuildTask("makeCommonSystemdBootConfigEsp", func(w Work) error {
 
 	// mcopy -i "${efibootimg}" -s "${work_dir}/loader" ::/
-	return nil
+	cmd := exutils.CommandWithStdio("mcopy", "-i", w.Files.EfibootImg, "-s", path.Join(w.Dirs.WorkArch, "loader"), "::/")
+	return cmd.Run()
 })
 
 var makeUefiX64SystemdBootEsp *BuildTask = NewBuildTask("makeUefiX64SystemdBootEsp", func(w Work) error {
@@ -135,15 +138,27 @@ var makeUefiX64SystemdBootEsp *BuildTask = NewBuildTask("makeUefiX64SystemdBootE
 	}
 
 	// Copy systemd-boot EFI binary to the default/fallback boot path
-	// mcopy -i "${efibootimg}" \
-	//    "${pacstrap_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" ::/EFI/BOOT/BOOTx64.EFI
+	{
+		systemdBootEfi := utils.Slash(w.Dirs.Pacstrap, "/usr/lib/systemd/boot/efi/systemd-bootx64.efi")
+		err := exutils.CommandWithStdio("mcopy", "-i", w.Files.EfibootImg, systemdBootEfi, "::/EFI/BOOT/BOOTx64.EFI").Run()
+		if err != nil {
+			return err
+		}
+	}
 
 	// Copy systemd-boot configuration files
 	if err := w.RunOnce(makeCommonSystemdBootConfigEsp); err != nil {
 		return err
 	}
 
 	// shellx64.efi is picked up automatically when on /
+	{
+		shellEfi := utils.Slash(w.Dirs.Pacstrap, "/usr/share/edk2-shell/x64/Shell_Full.efi")
+		err := exutils.CommandWithStdio("mcopy", "-i", w.Files.EfibootImg, shellEfi, "::/shellx64.efi").Run()
+		if err != nil {
+			return err
+		}
+	}
 
 	return nil
 })
@@ -158,14 +173,23 @@ var makeUefiX64SystemdBootElTorito *BuildTask = NewBuildTask("makeUefiX64Systemd
 	}
 
 	// Additionally set up systemd-boot in ISO 9660. This allows creating a medium for the live environment by using
-    // manual partitioning and simply copying the ISO 9660 file system contents.
-    // This is not related to El Torito booting and no firmware uses these files.
-    // _msg_info "Preparing an /EFI directory for the ISO 9660 file system..."
-    // install -d -m 0755 -- "${isofs_dir}/EFI/BOOT"
-
-    // Copy systemd-boot EFI binary to the default/fallback boot path
-    // install -m 0644 -- "${pacstrap_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
-    //     "${isofs_dir}/EFI/BOOT/BOOTx64.EFI"
+	// manual partitioning and simply copying the ISO 9660 file system contents.
+	// This is not related to El Torito booting and no firmware uses these files.
+	slog.Info("Preparing an /EFI directory for the ISO 9660 file system...")
+	if err := os.MkdirAll(path.Join(w.Dirs.Iso, "EFI", "BOOT"), 0755); err != nil {
+		return err
+	}
+
+	// Copy systemd-boot EFI binary to the default/fallback boot path
+	systemdBootEfi := utils.Slash(w.Dirs.Pacstrap, "/usr/lib/systemd/boot/efi/systemd-bootx64.efi")
+	t := cputils.CopyTask{
+		Source: systemdBootEfi,
+		Dest:   path.Join(w.Dirs.Iso, "EFI", "BOOT", "BOOTx64.EFI"),
+		Perm:   0644,
+	}
+	if err := cputils.CopyAll(t); err != nil {
+		return err
+	}
 
 	if err := w.RunOnce(makeCommonSystemdBootConfigIsofs); err != nil {
 		return err

alteriso5/work/task-bootmode-uefi-systemd.go

@@ -17,6 +17,7 @@ type Work struct {
 	target  *config.Target
 	Cmd     *cobra.Command
 	Dirs    *dirs
+	Files   *files
 }
 
 type dirs struct {
@@ -25,6 +26,12 @@ type dirs struct {
 	Work     string
 	Pacstrap string
 	Iso      string
+	WorkArch string
+	Efiboot  string
+}
+
+type files struct {
+	EfibootImg string
 }
 
 type configValues struct {
@@ -33,7 +40,6 @@ type configValues struct {
 }
 
 func New(dir string) *Work {
-
 	w := Work{
 		Base: dir,
 	}
@@ -52,11 +58,21 @@ func (w *Work) GetDirs() (*dirs, error) {
 		Work:     w.Base,
 		Pacstrap: path.Join(w.Base, w.target.Arch, "airootfs"),
 		Iso:      path.Join(w.Base, "iso"),
+		WorkArch: path.Join(w.Base, w.target.Arch),
+		Efiboot:  path.Join(w.Base, w.target.Arch, "efiboot"),
 	}
 
 	return &dv, nil
 }
 
+func (w *Work) GetFiles() (*files, error) {
+	fv := files{
+		EfibootImg: path.Join(w.Dirs.Iso, "efiboot.img"),
+	}
+
+	return &fv, nil
+}
+
 func (w *Work) GetChroot() (*airootfs.Chroot, error) {
 	return airootfs.GetChrootDir(w.Dirs.Pacstrap, w.target.Arch, path.Join(w.profile.Base, "pacman.conf"))
 }