From 2dd83da480390b7b64a21158ff1a6962c6da56ac Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Fri, 17 Feb 2023 13:39:55 -0800
Subject: [PATCH] cmd/mkinitfs: use filelist/osksdl

---
 cmd/mkinitfs/main.go | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/cmd/mkinitfs/main.go b/cmd/mkinitfs/main.go
index 795c9de..5107bad 100644
--- a/cmd/mkinitfs/main.go
+++ b/cmd/mkinitfs/main.go
@@ -19,6 +19,7 @@ import (
 	"time"
 
 	"gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/archive"
+	"gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/filelist/osksdl"
 	"gitlab.com/postmarketOS/postmarketos-mkinitfs/internal/misc"
 	"gitlab.com/postmarketOS/postmarketos-mkinitfs/pkgs/deviceinfo"
 )
@@ -484,15 +485,12 @@ func getInitfsExtraFiles(devinfo deviceinfo.DeviceInfo) (files []string, err err
 		}
 	}
 
-	if misc.Exists("/usr/bin/osk-sdl") {
-		log.Println("- Including FDE support")
-		if fdeFiles, err := getFdeFiles(devinfo); err != nil {
-			return nil, err
-		} else {
-			files = append(files, fdeFiles...)
-		}
-	} else {
-		log.Println("- *NOT* including FDE support")
+	osksdlFiles := osksdl.New(devinfo.MesaDriver)
+	if filelist, err := osksdlFiles.List(); err != nil {
+		return nil, err
+	} else if len(filelist) > 0 {
+		log.Println("- Including osk-sdl support")
+		files = append(files, filelist...)
 	}
 
 	return