smallsolar/postmarketos-mkinitfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

cmd/mkinitfs: move getInitfsFiles into generateInitfs

Browse Source 
Prep for simplifying things a bit...
This commit is contained in:
Clayton Craft
2023-02-17 22:01:06 -08:00
parent 6fdc8937b5
commit 14873015c0
1 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
cmd/mkinitfs/main.go
View File

@@ -173,35 +173,6 @@ func getInitfsExtraFiles(devinfo deviceinfo.DeviceInfo) (files []string, err err
return
}
func getInitfsFiles(devinfo deviceinfo.DeviceInfo, files misc.Items) (err error) {
log.Println("== Generating initramfs ==")
// Hook files & scripts
if misc.Exists("/etc/mkinitfs/files") {
log.Println("- Including hook files")
hookFiles := hookfiles.New("/etc/postmarketos-mkinitfs/files")
if list, err := hookFiles.List(); err != nil {
return nil, err
} else {
files = append(files, list...)
}
}
if misc.Exists("/etc/mkinitfs/hooks") {
log.Println("- Including hook scripts")
hookScripts := hookscripts.New("/etc/mkinitfs/hooks")
if list, err := hookScripts.List(); err != nil {
return nil, err
} else {
files = append(files, list...)
}
}
return
}
func Copy(srcFile, dstFile string) error {
out, err := os.Create(dstFile)
if err != nil {
@@ -252,9 +223,31 @@ func generateInitfs(name string, path string, kernVer string, devinfo deviceinfo
return err
}
if files, err := getInitfsFiles(devinfo); err != nil {
log.Println("== Generating initramfs ==")
files := []string{}
// Hook files & scripts
if misc.Exists("/etc/mkinitfs/files") {
log.Println("- Including hook files")
hookFiles := hookfiles.New("/etc/mkinitfs/files")
if list, err := hookFiles.List(); err != nil {
return err
} else {
files = append(files, list...)
}
}
if misc.Exists("/etc/mkinitfs/hooks") {
log.Println("- Including hook scripts")
hookScripts := hookscripts.New("/etc/mkinitfs/hooks")
if list, err := hookScripts.List(); err != nil {
return err
} else {
files = append(files, list...)
}
}
items := make(map[string]string)
// copy files into a map, where the source(key) and dest(value) are the
// same
@@ -264,7 +257,6 @@ func generateInitfs(name string, path string, kernVer string, devinfo deviceinfo
if err := initfsArchive.AddItems(items); err != nil {
return err
}
}
log.Println("- Including kernel modules")
modules := modules.New(strings.Fields(devinfo.ModulesInitfs))