cmd/mkinitfs: move getInitfsFiles into generateInitfs

Prep for simplifying things a bit...

cmd/mkinitfs/main.go

@@ -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,20 +223,41 @@ func generateInitfs(name string, path string, kernVer string, devinfo deviceinfo
 		return err
 	}
 
-	if files, err := getInitfsFiles(devinfo); err != nil {
+	log.Println("== Generating initramfs ==")
-		return err
+
-	} else {
+	files := []string{}
-		items := make(map[string]string)
+	// Hook files & scripts
-		// copy files into a map, where the source(key) and dest(value) are the
+	if misc.Exists("/etc/mkinitfs/files") {
-		// same
+		log.Println("- Including hook files")
-		for _, f := range files {
+		hookFiles := hookfiles.New("/etc/mkinitfs/files")
-			items[f] = f
+		if list, err := hookFiles.List(); err != nil {
-		}
-		if err := initfsArchive.AddItems(items); 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
+	for _, f := range files {
+		items[f] = f
+	}
+	if err := initfsArchive.AddItems(items); err != nil {
+		return err
+	}
+
 	log.Println("- Including kernel modules")
 	modules := modules.New(strings.Fields(devinfo.ModulesInitfs))
 	if list, err := modules.List(); err != nil {