From 323ab9932e16806f07699e3a7be53052686daa10 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Fri, 8 May 2020 17:08:48 +0200
Subject: [PATCH] Remove use of <configfile> feature of init

Issue genodelabs/genode#3753
---
 recipes/pkg/sdl_vnc/runtime |  3 +--
 run/audio_player.run        |  4 ++--
 run/log_fader.run           | 24 ++++++++++++++----------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/recipes/pkg/sdl_vnc/runtime b/recipes/pkg/sdl_vnc/runtime
index 602802b..b9ca4af 100644
--- a/recipes/pkg/sdl_vnc/runtime
+++ b/recipes/pkg/sdl_vnc/runtime
@@ -39,7 +39,6 @@
 
 		<start name="sdl_vnc" caps="150">
 			<resource name="RAM" quantum="36M"/>
-			<configfile name="sdl_vnc.config"/>
 <!--
 			<config>
 				<arg value="sdlvncviewer"/>
@@ -55,7 +54,7 @@
 			</config>
 -->
 			<route>
-				<service name="ROM" label="sdl_vnc.config">
+				<service name="ROM" label="config">
 					<child name="fs_rom" label="config"/> </service>
 				<any-service> <parent/> <any-child/> </any-service>
 			</route>
diff --git a/run/audio_player.run b/run/audio_player.run
index bc563e8..6794153 100644
--- a/run/audio_player.run
+++ b/run/audio_player.run
@@ -129,9 +129,9 @@ append config {
 
 	<start name="audio_player" caps="150">
 		<resource name="RAM" quantum="24M"/>
-		<configfile name="audio_player.config"/>
 		<route>
-			<service name="ROM" label="audio_player.config"> <child name="dynamic_rom"/> </service>
+			<service name="ROM" label="config">
+				<child name="dynamic_rom" label="audio_player.config"/> </service>
 			<service name="ROM" label="playlist"> <child name="dynamic_rom"/> </service>
 			<service name="Report"> <child name="report_rom"/> </service>
 			<any-service> <parent/> <any-child/> </any-service>
diff --git a/run/log_fader.run b/run/log_fader.run
index b3e68f8..f1489cb 100644
--- a/run/log_fader.run
+++ b/run/log_fader.run
@@ -25,7 +25,6 @@ set build_components {
 	server/nit_fb
 	server/nitpicker
 	server/rom_filter
-	server/terminal
 	server/terminal_log
 	test/nitpicker
 }
@@ -34,6 +33,9 @@ build $build_components
 
 create_boot_directory
 
+import_from_depot [depot_user]/raw/ttf-bitstream-vera-minimal \
+                  [depot_user]/pkg/terminal
+
 #
 # Generate config
 #
@@ -137,10 +139,8 @@ append config {
 	<start name="nitpicker">
 		<resource name="RAM" quantum="4M"/>
 		<provides><service name="Nitpicker"/></provides>
-		<configfile name="nitpicker.config"/>
 		<route>
-			<service name="ROM" label="nitpicker.config">
-				<child name="nitpicker_config"/> </service>
+			<service name="ROM" label="config"> <child name="nitpicker_config"/> </service>
 			<service name="Framebuffer"> <child name="fb_drv" /> </service>
 			<service name="Input"> <child name="input_drv" /> </service>
 			<service name="Report"> <child name="report_rom" /> </service>
@@ -205,11 +205,9 @@ append config {
 		<binary name="nit_fader"/>
 		<resource name="RAM" quantum="5M"/>
 		<provides> <service name="Nitpicker"/> </provides>
-		<configfile name="log_fader.config" />
 		<route>
-			<service name="ROM" label="log_fader.config">
-				<child name="log_fader_config" />
-			</service>
+			<service name="ROM" label="config">
+				<child name="log_fader_config" /> </service>
 			<service name="Nitpicker"> <child name="nitpicker" /> </service>
 			<any-service> <parent/> <any-child/> </any-service>
 		</route>
@@ -231,7 +229,14 @@ append config {
 		<resource name="RAM" quantum="3M"/>
 		<provides><service name="Terminal"/></provides>
 		<config>
-			<font size="8"/>
+			<vfs>
+				<rom name="VeraMono.ttf"/>
+				<dir name="fonts">
+					<dir name="monospace">
+						<ttf name="regular" path="/VeraMono.ttf" size_px="16"/>
+					</dir>
+				</dir>
+			</vfs>
 		</config>
 		<route>
 			<service name="Input">       <child name="log_fb"/> </service>
@@ -292,7 +297,6 @@ set boot_modules {
 	report_rom
 	rom_filter
 	rom_logger
-	terminal
 	terminal_log
 	testnit
 	timer