sculpt: disable serial output when LOG!=core

Issue #5180
genodelabs · Apr 19, 2024 · 7e23b70 · 7e23b70
1 parent 0a5e174
commit 7e23b70
Showing 1 changed file with 25 additions and 6 deletions.
diff --git a/repos/gems/run/sculpt.run b/repos/gems/run/sculpt.run
@@ -25,8 +25,29 @@ proc assert_platform_supported { } {
 assert_platform_supported
 
 
-if {[have_spec nova]} {
-	proc kernel_output { } { return "novga serial logmem" }
+proc log_core { } {
+
+	global ::env
+
+	if {[info exists ::env(LOG)]} {
+		if {$::env(LOG) == "core"} { return true }
+	}
+
+	return false
+}
+
+
+if {[log_core]} {
+	if {[have_spec nova]} {
+		proc kernel_output { } { return "novga serial logmem" }
+	}
+} else {
+	# disable default enabled serial log output via core
+	proc boot_output { } { return "" }
+
+	if {[have_spec nova]} {
+		proc kernel_output { } { return "novga logmem" }
+	}
 }
 
 
@@ -141,10 +162,8 @@ import_from_depot [depot_user]/src/[base_src] \
 
 proc log_route { } {
 
-	global ::env
-	if {[info exists ::env(LOG)]} {
-		if {$::env(LOG) == "core"} {
-			return {<service name="LOG"> <parent/> </service>} } }
+	if {[log_core]} {
+		return {<service name="LOG"> <parent/> </service>} }
 
 	return {<service name="LOG"> <child name="log"/> </service>}
 }