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

cmd/mkinitfs: don't hardcode binaries/files for including in archives

Browse Source 
Obvious breaking change... These files should be provided by "hook file"
lists instead.
This commit is contained in:
Clayton Craft
2023-02-17 14:46:54 -08:00
parent e8854ff88d
commit 8b99b5f45b
1 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/mkinitfs/main.go
View File

@@ -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
}