From ed2b6dbb21c425489d54ab52c6740bcd2e1c1706 Mon Sep 17 00:00:00 2001
From: j1nx
Date: Wed, 8 Nov 2023 15:03:56 +0000
Subject: [PATCH] [ALL] Only start the ovos-splash after the DRI and FB devices
are initialized
---
.../package/ovos-splash/ovos-splash-start.service | 4 +++-
.../usr/lib/systemd/system-preset/10-ovos.preset | 1 +
.../rootfs-overlay/usr/lib/udev/rules.d/60-framebuffer.rules | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
create mode 100644 buildroot-external/rootfs-overlay/usr/lib/udev/rules.d/60-framebuffer.rules
diff --git a/buildroot-external/package/ovos-splash/ovos-splash-start.service b/buildroot-external/package/ovos-splash/ovos-splash-start.service
index 8fb4f8df..62fca06a 100644
--- a/buildroot-external/package/ovos-splash/ovos-splash-start.service
+++ b/buildroot-external/package/ovos-splash/ovos-splash-start.service
@@ -1,7 +1,9 @@
[Unit]
Description=Starts OVOS splash boot screen
-Wants=dev-dri-card0.device
+Requires=dev-dri-card0.device
After=dev-dri-card0.device
+Requires=dev-fb0.device
+After=dev-fb0.device
DefaultDependencies=no
RequiresMountsFor=/run
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-ovos.preset b/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-ovos.preset
index 1ea340ca..fe8ae1b9 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-ovos.preset
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-ovos.preset
@@ -6,6 +6,7 @@ enable NetworkManager.service
enable getty@tty1.service
enable ovos-splash-start.service
enable ovos-splash-systemd.service
+enable ovos-splash-quit.service
enable smb.service
enable nmb.service
enable mglru.service
diff --git a/buildroot-external/rootfs-overlay/usr/lib/udev/rules.d/60-framebuffer.rules b/buildroot-external/rootfs-overlay/usr/lib/udev/rules.d/60-framebuffer.rules
new file mode 100644
index 00000000..dcaa129c
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/usr/lib/udev/rules.d/60-framebuffer.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="graphics", KERNEL=="fb[0-9]*", TAG+="systemd"