From 8b99b5f45b4a291357119508c6e8b3f1f741e73b Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Fri, 17 Feb 2023 14:46:54 -0800
Subject: [PATCH] cmd/mkinitfs: don't hardcode binaries/files for including in
 archives

Obvious breaking change... These files should be provided by "hook file"
lists instead.
---
 cmd/mkinitfs/main.go | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/cmd/mkinitfs/main.go b/cmd/mkinitfs/main.go
index 5626e24..82c538e 100644
--- a/cmd/mkinitfs/main.go
+++ b/cmd/mkinitfs/main.go
@@ -138,21 +138,6 @@ func bootDeploy(workDir string, outDir string) error {
 
 func getInitfsExtraFiles(devinfo deviceinfo.DeviceInfo) (files []string, err error) {
 	log.Println("== Generating initramfs extra ==")
-	binariesExtra := []string{
-		"/lib/libz.so.1",
-		"/sbin/btrfs",
-		"/sbin/dmsetup",
-		"/sbin/e2fsck",
-		"/usr/sbin/parted",
-		"/usr/sbin/resize2fs",
-		"/usr/sbin/resize.f2fs",
-	}
-	log.Println("- Including extra binaries")
-	if filelist, err := misc.GetFiles(binariesExtra, true); err != nil {
-		return nil, err
-	} else {
-		files = append(files, filelist...)
-	}
 
 	// Hook files & scripts
 	if misc.Exists("/etc/postmarketos-mkinitfs/files-extra") {
@@ -190,15 +175,6 @@ func getInitfsExtraFiles(devinfo deviceinfo.DeviceInfo) (files []string, err err
 
 func getInitfsFiles(devinfo deviceinfo.DeviceInfo) (files []string, err error) {
 	log.Println("== Generating initramfs ==")
-	requiredFiles := []string{
-		"/bin/busybox",
-		"/bin/sh",
-		"/bin/busybox-extras",
-		"/usr/sbin/telnetd",
-		"/usr/sbin/kpartx",
-		"/etc/deviceinfo",
-		"/usr/bin/unudhcpd",
-	}
 
 	// Hook files & scripts
 	if misc.Exists("/etc/postmarketos-mkinitfs/files") {
@@ -223,13 +199,6 @@ func getInitfsFiles(devinfo deviceinfo.DeviceInfo) (files []string, err error) {
 		}
 	}
 
-	log.Println("- Including required binaries")
-	if filelist, err := misc.GetFiles(requiredFiles, true); err != nil {
-		return nil, err
-	} else {
-		files = append(files, filelist...)
-	}
-
 	return
 }