diff --git a/config/minimal.toml b/config/minimal.toml
index 03a6d496d1..b8b8ce0bae 100644
--- a/config/minimal.toml
+++ b/config/minimal.toml
@@ -47,16 +47,16 @@ type = "oneshot_async"
 
 [[files]]
 path = "/etc/init.d/31_debug_console.service"
+# The serial/debug console is now driven by fbcond, which mirrors the
+# framebuffer console (boot log + getty login prompt) onto the kernel debug
+# (serial) line and feeds serial input back into the same VT getty. A separate
+# `getty /scheme/debug/no-preserve` would compete with fbcond for the single
+# shared debug input queue and duplicate output, so it is disabled.
 data = """
 [unit]
-description = "Debug console"
-requires_weak = [
-    "29_activate_console.service",
-    "00_ptyd.service",
-]
+description = "Debug console (handled by fbcond serial mirror)"
 
 [service]
-cmd = "getty"
-args = ["/scheme/debug/no-preserve", "-J"]
-type = "oneshot_async"
+cmd = "true"
+type = "oneshot"
 """
diff --git a/config/redbear-mini.toml b/config/redbear-mini.toml
index 11afb7eb96..6baff02e0c 100644
--- a/config/redbear-mini.toml
+++ b/config/redbear-mini.toml
@@ -546,18 +546,14 @@ type = "oneshot_async"
 
 [[files]]
 path = "/etc/init.d/31_debug_console.service"
+# Serial/debug console handled by fbcond's serial mirror (see minimal.toml).
 data = """
 [unit]
-description = "Debug console"
-requires_weak = [
-    "29_activate_console.service",
-    "00_ptyd.service",
-]
+description = "Debug console (handled by fbcond serial mirror)"
 
 [service]
-cmd = "getty"
-args = ["/scheme/debug/no-preserve", "-J"]
-type = "oneshot_async"
+cmd = "true"
+type = "oneshot"
 """
 
 [[files]]
diff --git a/local/sources/base b/local/sources/base
index 0120017484..e9342b78e9 160000
--- a/local/sources/base
+++ b/local/sources/base
@@ -1 +1 @@
-Subproject commit 012001748464bf94f69d440ef29c32782ee9d56d
+Subproject commit e9342b78e90b4f2996f5900a286f0ae086485a06
diff --git a/local/sources/kernel b/local/sources/kernel
index 40e3c4911a..229046c634 160000
--- a/local/sources/kernel
+++ b/local/sources/kernel
@@ -1 +1 @@
-Subproject commit 40e3c4911a64e3f2c9b78411d78c5e27c68572ec
+Subproject commit 229046c6348f264ef1abbb040b5c5b5553e07e86