filelist/hookscripts: use the correct path for scripts

When this is printed, it's about to search the given path for stuff to
slurp up, but it hasn't actually included anything yet. Using
"Including" here was kinda confusing, so this changes it to use
"Searching for." Hopefully that's better!

cmd/mkinitfs/main.go

@@ -47,6 +47,8 @@ func main() {
 		return
 	}
 
+	log.Default().SetFlags(log.Lmicroseconds)
+
 	deviceinfoFile := "/etc/deviceinfo"
 	if exists, err := misc.Exists(deviceinfoFile); !exists {
 		log.Printf("NOTE: %q not found, this file is required by mkinitfs.\n", deviceinfoFile)
@@ -63,10 +65,6 @@ func main() {
 		return
 	}
 
-	// deviceinfo.InitfsCompression needs a little more post-processing
-	compressionFormat, compressionLevel := archive.ExtractFormatLevel(devinfo.InitfsCompression)
-	log.Printf("Using compression format %s with level %q\n", compressionFormat, compressionLevel)
-
 	defer misc.TimeFunc(time.Now(), "mkinitfs")
 
 	kernVer, err := osutil.GetKernelVersion()
@@ -95,13 +93,15 @@ func main() {
 	log.Print("Generating for kernel version: ", kernVer)
 	log.Print("Output directory: ", *outDir)
 
+	// deviceinfo.InitfsCompression needs a little more post-processing
+	compressionFormat, compressionLevel := archive.ExtractFormatLevel(devinfo.InitfsCompression)
 	if err := generateArchive("initramfs", compressionFormat, compressionLevel, workDir, []filelist.FileLister{
 		hookdirs.New("/usr/share/mkinitfs/dirs"),
 		hookdirs.New("/etc/mkinitfs/dirs"),
 		hookfiles.New("/usr/share/mkinitfs/files"),
 		hookfiles.New("/etc/mkinitfs/files"),
-		hookscripts.New("/usr/share/mkinitfs/hooks"),
+		hookscripts.New("/usr/share/mkinitfs/hooks", "/hooks"),
-		hookscripts.New("/etc/mkinitfs/hooks"),
+		hookscripts.New("/etc/mkinitfs/hooks", "/hooks"),
 		modules.New(strings.Fields(devinfo.ModulesInitfs), "/usr/share/mkinitfs/modules"),
 		modules.New([]string{}, "/etc/mkinitfs/modules"),
 	}); err != nil {
@@ -111,14 +111,13 @@ func main() {
 		return
 	}
 
-	// Note: compression disabled for initramfs-extra, since it slows down boot
+	// deviceinfo.InitfsExtraCompression needs a little more post-processing
-	// and can add more requirements to the initramfs (e.g. need to add support
+	compressionFormat, compressionLevel = archive.ExtractFormatLevel(devinfo.InitfsExtraCompression)
-	// for extracting zstd)
+	if err := generateArchive("initramfs-extra", compressionFormat, compressionLevel, workDir, []filelist.FileLister{
-	if err := generateArchive("initramfs-extra", archive.FormatNone, archive.LevelDefault, workDir, []filelist.FileLister{
 		hookfiles.New("/usr/share/mkinitfs/files-extra"),
 		hookfiles.New("/etc/mkinitfs/files-extra"),
-		hookscripts.New("/usr/share/mkinitfs/hooks-extra"),
+		hookscripts.New("/usr/share/mkinitfs/hooks-extra", "/hooks-extra"),
-		hookscripts.New("/etc/mkinitfs/hooks-extra"),
+		hookscripts.New("/etc/mkinitfs/hooks-extra", "/hooks-extra"),
 		modules.New([]string{}, "/usr/share/mkinitfs/modules-extra"),
 		modules.New([]string{}, "/etc/mkinitfs/modules-extra"),
 		osksdl.New(devinfo.MesaDriver),
@@ -150,6 +149,8 @@ func bootDeploy(workDir, outDir, ubootBoardname string) error {
 
 func generateArchive(name string, format archive.CompressFormat, level archive.CompressLevel, path string, features []filelist.FileLister) error {
 	log.Printf("== Generating %s ==\n", name)
+	log.Printf("- Using compression format %s with level %q\n", format, level)
+
 	defer misc.TimeFunc(time.Now(), name)
 	a, err := archive.New(format, level)
 	if err != nil {

doc/mkinitfs.1.scd

@@ -33,6 +33,7 @@ mkinitfs reads deviceinfo values from */etc/deviceinfo*. The following variables
 are *required* by mkinitfs:
 
 	- deviceinfo_initfs_compression
+	- deviceinfo_initfs_extra_compression
 	- deviceinfo_mesa_driver
 	- deviceinfo_modules_initfs
 	- deviceinfo_uboot_boardname
@@ -40,6 +41,10 @@ are *required* by mkinitfs:
 It is a design goal to keep the number of required variables from deviceinfo to
 a bare minimum, and to require only variables that don't hold lists of things.
 
+*NOTE*: When deviceinfo_initfs_extra_compression is set, make sure that the
+necessary tools to extract the configured archive format are in the initramfs
+archive.
+
 # DIRECTORIES
 
 The following directories are used by mkinitfs to generate the initramfs and

internal/bootdeploy/bootdeploy.go

@@ -2,10 +2,12 @@ package bootdeploy
 
 import (
 	"errors"
+	"fmt"
 	"io"
 	"log"
 	"os"
 	"os/exec"
+	"path"
 	"path/filepath"
 	"strings"
 )
@@ -68,7 +70,8 @@ func bootDeploy(workDir string, outDir string) error {
 	}
 	defer kernFd.Close()
 
-	kernFileCopy, err := os.Create(filepath.Join(workDir, "vmlinuz"))
+	kernFilename := path.Base(kernFile)
+	kernFileCopy, err := os.Create(filepath.Join(workDir, kernFilename))
 	if err != nil {
 		return err
 	}
@@ -76,12 +79,14 @@ func bootDeploy(workDir string, outDir string) error {
 	if _, err = io.Copy(kernFileCopy, kernFd); err != nil {
 		return err
 	}
-	kernFileCopy.Close()
+	if err := kernFileCopy.Close(); err != nil {
+		return fmt.Errorf("error closing %s: %w", kernFilename, err)
+	}
 
 	// boot-deploy -i initramfs -k vmlinuz-postmarketos-rockchip -d /tmp/cpio -o /tmp/foo initramfs-extra
 	cmd := exec.Command("boot-deploy",
 		"-i", "initramfs",
-		"-k", "vmlinuz",
+		"-k", kernFilename,
 		"-d", workDir,
 		"-o", outDir,
 		"initramfs-extra")

internal/filelist/hookdirs/hookdirs.go

@@ -23,7 +23,7 @@ func New(path string) *HookDirs {
 }
 
 func (h *HookDirs) List() (*filelist.FileList, error) {
-	log.Printf("- Creating directories specified in %s", h.path)
+	log.Printf("- Searching for directories specified in %s", h.path)
 
 	files := filelist.NewFileList()
 	fileInfo, err := os.ReadDir(h.path)

internal/filelist/hookfiles/hookfiles.go

@@ -26,7 +26,7 @@ func New(filePath string) *HookFiles {
 }
 
 func (h *HookFiles) List() (*filelist.FileList, error) {
-	log.Printf("- Including file lists from %s", h.filePath)
+	log.Printf("- Searching for file lists from %s", h.filePath)
 
 	files := filelist.NewFileList()
 	fileInfo, err := os.ReadDir(h.filePath)

internal/filelist/hookscripts/hookscripts.go

@@ -9,19 +9,22 @@ import (
 )
 
 type HookScripts struct {
+	destPath   string
 	scriptsDir string
 }
 
 // New returns a new HookScripts that will use the given path to provide a list
-// of script files.
+// of script files. The destination for each script it set to destPath, using
-func New(scriptsDir string) *HookScripts {
+// the original file name.
+func New(scriptsDir string, destPath string) *HookScripts {
 	return &HookScripts{
+		destPath:   destPath,
 		scriptsDir: scriptsDir,
 	}
 }
 
 func (h *HookScripts) List() (*filelist.FileList, error) {
-	log.Printf("- Including hook scripts from %s", h.scriptsDir)
+	log.Printf("- Searching for hook scripts from %s", h.scriptsDir)
 
 	files := filelist.NewFileList()
 
@@ -32,7 +35,8 @@ func (h *HookScripts) List() (*filelist.FileList, error) {
 	}
 	for _, file := range fileInfo {
 		path := filepath.Join(h.scriptsDir, file.Name())
-		files.Add(path, path)
+		log.Printf("-- Including script: %s\n", path)
+		files.Add(path, filepath.Join(h.destPath, file.Name()))
 	}
 	return files, nil
 }

internal/filelist/modules/modules.go

@@ -30,7 +30,7 @@ func New(modulesList []string, modulesListPath string) *Modules {
 }
 
 func (m *Modules) List() (*filelist.FileList, error) {
-	log.Println("- Including kernel modules")
+	log.Printf("- Searching for kernel modules from %s", m.modulesListPath)
 
 	kernVer, err := osutil.GetKernelVersion()
 	if err != nil {

pkgs/deviceinfo/deviceinfo.go

@@ -14,10 +14,11 @@ import (
 )
 
 type DeviceInfo struct {
-	InitfsCompression string
+	InitfsCompression      string
-	MesaDriver        string
+	InitfsExtraCompression string
-	ModulesInitfs     string
+	MesaDriver             string
-	UbootBoardname    string
+	ModulesInitfs          string
+	UbootBoardname         string
 }
 
 func ReadDeviceinfo(file string) (DeviceInfo, error) {

pkgs/deviceinfo/deviceinfo_test.go

@@ -21,6 +21,7 @@ func TestNameToField(t *testing.T) {
 		{"deviceinfo_modules_initfs", "ModulesInitfs"},
 		{"modules_initfs", "ModulesInitfs"},
 		{"deviceinfo_modules_initfs___", "ModulesInitfs"},
+		{"deviceinfo_initfs_extra_compression", "InitfsExtraCompression"},
 	}
 
 	for _, table := range tables {