From d93d3fbfcacf811d96303ca216c83d9ce78a8561 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Fri, 4 Feb 2022 17:03:08 +0100
Subject: [PATCH] log_core.run: use terminal_log instead of fs_log

Issue #4400
---
 repos/os/run/log_core.run | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/repos/os/run/log_core.run b/repos/os/run/log_core.run
index f86612d688..645470d473 100644
--- a/repos/os/run/log_core.run
+++ b/repos/os/run/log_core.run
@@ -16,7 +16,7 @@ if {[have_spec nova]} {
 	proc kernel_output { } { return "novga logmem" }
 }
 
-build "core init timer server/vfs server/fs_log app/log_core"
+build { core init timer server/file_terminal server/terminal_log app/log_core }
 
 create_boot_directory
 
@@ -43,26 +43,24 @@ append config {
 		<provides><service name="Timer"/></provides>
 	</start>
 
-	<start name="vfs">
-		<resource name="RAM" quantum="2M"/>
-		<provides><service name="File_system"/></provides>
+	<start name="file_terminal">
+		<binary name="file_terminal"/>
+		<resource name="RAM" quantum="2096K"/>
+		<provides> <service name="Terminal"/> </provides>
 		<config>
-			<vfs>
-				<!-- be careful to avoid endless output loop for core.log -->
-				<dir name="log_core"> <} [log_service] { name="log.log"/> </dir>
-			</vfs>
-			<policy label_prefix="fs_log" writeable="yes" root="/"/>
+			<default-policy filename="log" />
+			<vfs> <dir name="dev"> <log/> </dir> <log label="log_core"/> </vfs>
+			<libc stdout="/dev/log"/>
 		</config>
+		<route> <any-service> <parent/> </any-service> </route>
 	</start>
 
-	<start name="fs_log">
-		<resource name="RAM" quantum="2M"/>
-		<provides><service name="LOG"/></provides>
-		<config>
-			<policy label="log_core -> log"/>
-		</config>
+	<start name="terminal_log">
+		<resource name="RAM" quantum="1M"/>
+		<provides> <service name="LOG"/> </provides>
+		<config/>
 		<route>
-			<service name="File_system"> <child name="vfs"/> </service>
+			<service name="Terminal"> <child name="file_terminal"/> </service>
 			<any-service> <parent/> </any-service>
 		</route>
 	</start>
@@ -75,7 +73,7 @@ append config {
 			<service name="ROM" unscoped_label="ld.lib.so"> <parent/> </service>
 			<service name="ROM" label="log"> <parent label="core_log"/> </service>
 			<service name="Timer"> <child name="timer"/> </service>
-			<service name="LOG" label="log"> <child name="fs_log"/> </service>
+			<service name="LOG" label="log"> <child name="terminal_log"/> </service>
 			<service name="PD"> <parent/> </service>
 			<service name="CPU"> <parent/> </service>
 			<service name="LOG"> <parent/> </service>
@@ -103,12 +101,15 @@ append config {
 
 install_config $config
 
-build_boot_image "core init timer ld.lib.so vfs fs_log log_core vfs.lib.so"
+build_boot_image {
+	core init timer ld.lib.so vfs.lib.so libc.lib.so
+	file_terminal terminal_log log_core
+}
 
 append qemu_args " -nographic "
 
 if { [get_cmd_switch --autopilot] } {
-	run_genode_until {.*\[init -> vfs] \[.*\n} 20
+	run_genode_until {.*\[log_core -> log] \[.*\n} 20
 } else {
 	run_genode_until forever
 }