From a7678123713517a3036d16fb5ee4f3a8116c35a1 Mon Sep 17 00:00:00 2001 From: Vasilito Date: Thu, 7 May 2026 20:51:05 +0100 Subject: [PATCH] fix: extend redbear-full DRM greeter wait Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus --- config/redbear-full.toml | 4 ++-- local/recipes/system/redbear-greeter/source/src/main.rs | 3 +++ .../recipes/system/redbear-session-launch/source/src/main.rs | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/config/redbear-full.toml b/config/redbear-full.toml index 67a6e6258..90ea56de5 100644 --- a/config/redbear-full.toml +++ b/config/redbear-full.toml @@ -482,8 +482,8 @@ data = """ name = "VirtIO GPU" class = 0x03 vendor = 0x1af4 -subclass = 0x00 -command = ["redox-drm"] +device = 0x1050 +command = ["/usr/bin/redox-drm"] """ [[files]] diff --git a/local/recipes/system/redbear-greeter/source/src/main.rs b/local/recipes/system/redbear-greeter/source/src/main.rs index 1a503faab..dbcc5a1ce 100644 --- a/local/recipes/system/redbear-greeter/source/src/main.rs +++ b/local/recipes/system/redbear-greeter/source/src/main.rs @@ -207,6 +207,9 @@ impl GreeterDaemon { command.env("XCURSOR_THEME", "Pop"); command.env("XKB_CONFIG_ROOT", "/usr/share/X11/xkb"); command.env("WAYLAND_DISPLAY", &self.wayland_display); + if let Ok(wait_seconds) = env::var("REDBEAR_DRM_WAIT_SECONDS") { + command.env("REDBEAR_DRM_WAIT_SECONDS", wait_seconds); + } } fn activate_vt(&self, vt: u32) -> Result<(), String> { diff --git a/local/recipes/system/redbear-session-launch/source/src/main.rs b/local/recipes/system/redbear-session-launch/source/src/main.rs index 226f949ae..c6a6324c6 100644 --- a/local/recipes/system/redbear-session-launch/source/src/main.rs +++ b/local/recipes/system/redbear-session-launch/source/src/main.rs @@ -303,6 +303,9 @@ fn build_environment(account: &Account, args: &Args, runtime_dir: &Path) -> BTre if let Some(path) = env_value(&["QML2_IMPORT_PATH"]) { values.insert(String::from("QML2_IMPORT_PATH"), path); } + if let Some(wait_seconds) = env_value(&["REDBEAR_DRM_WAIT_SECONDS"]) { + values.insert(String::from("REDBEAR_DRM_WAIT_SECONDS"), wait_seconds); + } match args.mode { LaunchMode::Session => {