From f74e711466f301057adb547606d6b9180f372ff1 Mon Sep 17 00:00:00 2001
From: Vasilito <adminpupkin@gmail.com>
Date: Fri, 24 Apr 2026 07:31:04 +0100
Subject: [PATCH] Fix PS/2 controller crash on bare metal, add Red Bear
 branding overrides
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PS/2 controller resilience:
- DisableFirst/DisableSecond commands now use retry (3 attempts)
  instead of failing on first timeout
- Added 50ms settling delay before first command after firmware handoff
- Disable command failures are non-fatal (warn + continue) — a truly
  absent controller fails later at self-test
- ps2d no longer panics on init failure — logs error and continues
  so the system can still boot to login prompt without PS/2 input

Branding overrides:
- Added /etc/issue override with Red Bear OS pre-login banner
- Added /etc/motd override with Red Bear OS post-login message
- Fixes transaction conflict where userutils overwrites redbear-release
  branding with upstream 'Redox OS' content

QEMU verified: boots to login prompt, no service errors
---
 config/redbear-live-mini.toml | 17 ++++++++++++-----
 config/redbear-minimal.toml   | 25 +++++++++++++++++++------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/config/redbear-live-mini.toml b/config/redbear-live-mini.toml
index 5f907405..c7a2426a 100644
--- a/config/redbear-live-mini.toml
+++ b/config/redbear-live-mini.toml
@@ -71,14 +71,21 @@ args = ["-f"]
 type = "oneshot_async"
 """
 
+[[files]]
+path = "/etc/issue"
+data = """
+########## Red Bear OS #########
+# Login with the following:    #
+# `user`                       #
+# `root`:`password`            #
+################################
+"""
+
 [[files]]
 path = "/etc/motd"
 data = """
-########## Red Bear OS ##########
-# Login with the following:      #
-# `user`                         #
-# `root`:`password`              #
-##################################
+  Red Bear OS v0.1.0 "Denali" — Built on Redox OS
+  Type 'help' for available commands.
 """
 
 [[files]]
diff --git a/config/redbear-minimal.toml b/config/redbear-minimal.toml
index 26a54410..777a48d3 100644
--- a/config/redbear-minimal.toml
+++ b/config/redbear-minimal.toml
@@ -42,13 +42,26 @@ mc = {}
 # Diagnostic tool
 redbear-info = {}
 
-# Phase 2 baseline: enable the default DHCP profile so VM and wired setups
-# use the existing netctl boot path automatically.
 [[files]]
 path = "/etc/netctl/active"
 data = "wired-dhcp\n"
 
-# VT/getty/login chain is handled by the combination of:
-#   1. initfs (phase 1): inputd daemon, vesad, fbcond — register input/display/fbcon schemes
-#   2. minimal.toml legacy 30_console: inputd -A 2 + nowait getty 2 + nowait getty /scheme/debug
-# No additional rootfs service files needed — initfs + legacy script covers the full chain.
+[[files]]
+path = "/etc/issue"
+data = """
+########## Red Bear OS #########
+# Login with the following:    #
+# `user`                       #
+# `root`:`password`            #
+################################
+"""
+
+[[files]]
+path = "/etc/motd"
+data = """
+  Red Bear OS v0.1.0 "Denali" — Built on Redox OS
+  Type 'help' for available commands.
+"""
+
+# VT/getty/login chain: initfs starts inputd + vesad + fbcond in phase 1,
+# then minimal.toml legacy 30_console runs inputd -A 2 + getty 2 + getty debug.