From 1a0d00e39f32990f37bc0310f542d9a186b56659 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Fri, 17 Feb 2023 13:08:46 -0800 Subject: [PATCH] cmd/mkinitfs: use filelist/hookscripts --- cmd/mkinitfs/main.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cmd/mkinitfs/main.go b/cmd/mkinitfs/main.go index 70ea916..648a668 100644 --- a/cmd/mkinitfs/main.go +++ b/cmd/mkinitfs/main.go @@ -19,6 +19,7 @@ import ( "gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/archive" "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/misc" "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") { 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 } 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") { 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 } else { - files = append(files, hookScripts...) + files = append(files, list...) } }