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

cmd/mkinitfs: use filelist/hookscripts

Browse Source
This commit is contained in:
Clayton Craft
2023-02-17 13:08:46 -08:00
parent af3c47c784
commit 1a0d00e39f
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/mkinitfs/main.go
View File

@@ -19,6 +19,7 @@ import (
"gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/archive" "gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/archive"
"gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/filelist/osksdl" "gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/filelist/osksdl"
"gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/filelist/hookscripts"
"gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/filelist/modules" "gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/filelist/modules"
"gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/misc" "gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/misc"
"gitlab.com/postmarketOS/postmarketos-mkinitfs/pkgs/deviceinfo" "gitlab.com/postmarketOS/postmarketos-mkinitfs/pkgs/deviceinfo"
@@ -368,10 +369,12 @@ func getInitfsExtraFiles(devinfo deviceinfo.DeviceInfo) (files []string, err err
if misc.Exists("/etc/postmarketos-mkinitfs/hooks-extra") { if misc.Exists("/etc/postmarketos-mkinitfs/hooks-extra") {
log.Println("- Including extra hook scripts") log.Println("- Including extra hook scripts")
if hookScripts, err := getHookScripts("/etc/postmarketos-mkinitfs/hooks-extra"); err != nil { hookScripts := hookscripts.New("/etc/postmarketos-mkinitfs/hooks-extra")
if list, err := hookScripts.List(); err != nil {
return nil, err return nil, err
} else { } else {
files = append(files, hookScripts...) files = append(files, list...)
} }
} }
@@ -414,10 +417,12 @@ func getInitfsFiles(devinfo deviceinfo.DeviceInfo) (files []string, err error) {
if misc.Exists("/etc/postmarketos-mkinitfs/hooks") { if misc.Exists("/etc/postmarketos-mkinitfs/hooks") {
log.Println("- Including hook scripts") log.Println("- Including hook scripts")
if hookScripts, err := getHookScripts("/etc/postmarketos-mkinitfs/hooks"); err != nil { hookScripts := hookscripts.New("/etc/postmarketos-mkinitfs/hooks")
if list, err := hookScripts.List(); err != nil {
return nil, err return nil, err
} else { } else {
files = append(files, hookScripts...) files = append(files, list...)
} }
} }