From d6bdeed38f293b1966bf285d5c678dac32a63a18 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Thu, 26 Mar 2020 16:01:06 +0100
Subject: [PATCH] report_dump: replace noux by plain bash

This patch also introduces the use of the RTC for creating directory
names and increases the rate of snapshot creation from 10 seconds to
one minute to make sure that directories are named differently when
reading the RTC clock at granularity of minutes.

Issue #3696
---
 repos/ports/recipes/pkg/report_dump/archives |   3 +-
 repos/ports/recipes/pkg/report_dump/runtime  | 111 +++++++++++++++----
 2 files changed, 89 insertions(+), 25 deletions(-)

diff --git a/repos/ports/recipes/pkg/report_dump/archives b/repos/ports/recipes/pkg/report_dump/archives
index 861ef1d96..3535ce1a7 100644
--- a/repos/ports/recipes/pkg/report_dump/archives
+++ b/repos/ports/recipes/pkg/report_dump/archives
@@ -1,7 +1,8 @@
-_/src/noux
 _/src/bash-minimal
 _/src/coreutils
 _/src/libc
 _/src/posix
 _/src/init
 _/src/vfs
+_/src/vfs_pipe
+_/src/fs_rom
diff --git a/repos/ports/recipes/pkg/report_dump/runtime b/repos/ports/recipes/pkg/report_dump/runtime
index c2e5ff4b2..c37fc60bc 100644
--- a/repos/ports/recipes/pkg/report_dump/runtime
+++ b/repos/ports/recipes/pkg/report_dump/runtime
@@ -1,45 +1,108 @@
-<runtime ram="50M" caps="1000" binary="noux">
+<runtime ram="80M" caps="1000" binary="init">
 
 	<requires>
 		<file_system label="report" writeable="no"/>
 		<file_system label="target" writeable="yes"/>
 		<timer/>
+		<rtc/>
 	</requires>
 
-	<config stdin="/dev/null" stdout="/dev/log" stderr="/dev/log">
-		<fstab>
-			<tar name="bash-minimal.tar" />
-			<tar name="coreutils.tar" />
-			<dir name="dev"> <zero/> <null/> <log/> </dir>
-			<dir name="rw">     <fs label="target"/> </dir>
-			<dir name="report"> <fs label="report"/> </dir>
-			<dir name="tmp"> <ram /> </dir>
-			<inline name=".bash_profile">
-				while true; do
-					export VERSION=`printf "%(%T)T"`
-					mkdir "/rw/$VERSION"
-					cp -r /report/* "/rw/$VERSION/"
-					sleep 10
-				done
-			</inline>
-		</fstab>
-		<start name="/bin/bash">
-			<arg value="--login" />
-			<env name="HOME" value="/" />
-			<env name="TERM" value="screen" />
+	<config>
+		<parent-provides>
+			<service name="ROM"/>
+			<service name="PD"/>
+			<service name="RM"/>
+			<service name="CPU"/>
+			<service name="LOG"/>
+			<service name="Timer"/>
+			<service name="File_system"/>
+			<service name="Rtc"/>
+		</parent-provides>
+
+		<default-route> <any-service> <parent/> <any-child/> </any-service> </default-route>
+
+		<default caps="100"/>
+
+		<start name="vfs" caps="150">
+			<resource name="RAM" quantum="12M"/>
+			<provides><service name="File_system"/></provides>
+			<config>
+				<vfs>
+					<tar name="bash-minimal.tar" />
+					<tar name="coreutils.tar" />
+					<dir name="dev">
+						<zero/> <null/> <log/> <rtc/>
+						<dir name="pipe"> <pipe/> </dir>
+					</dir>
+					<dir name="rw">     <fs label="target"/> </dir>
+					<dir name="report"> <fs label="report"/> </dir>
+					<dir name="tmp"> <ram /> </dir>
+					<inline name=".bash_profile">
+						while true; do
+							export VERSION=`printf "%(%T)T"`
+							mkdir "/rw/$VERSION"
+							cp -r /report/* "/rw/$VERSION/"
+							sleep 60
+						done
+					</inline>
+				</vfs>
+				<policy label_prefix="vfs_rom" root="/"/>
+				<default-policy root="/" writeable="yes"/>
+			</config>
+			<route>
+				<service name="File_system" label="target"> <parent label="target"/> </service>
+				<service name="File_system" label="report"> <parent label="report"/> </service>
+				<any-service> <parent/> </any-service>
+			</route>
 		</start>
+
+		<start name="vfs_rom">
+			<resource name="RAM" quantum="16M"/>
+			<binary name="fs_rom"/>
+			<provides> <service name="ROM"/> </provides>
+			<config/>
+			<route>
+				<service name="File_system"> <child name="vfs"/> </service>
+				<any-service> <parent/> </any-service>
+			</route>
+		</start>
+
+		<start name="/bin/bash" caps="450">
+			<resource name="RAM" quantum="28M" />
+			<exit propagate="yes"/>
+			<config>
+				<libc stdin="/dev/null" stdout="/dev/null"
+				      stderr="/dev/log" rtc="/dev/rtc" pipe="/dev/pipe"/>
+				<vfs> <fs/> </vfs>
+				<arg value="bash"/>
+				<arg value="--login"/>
+				<env key="TERM" value="screen"/>
+				<env key="PATH" value="/bin" />
+				<env key="HOME" value="/" />
+			</config>
+			<route>
+				<service name="File_system"> <child name="vfs"/> </service>
+				<service name="ROM" label_suffix=".lib.so"> <parent/> </service>
+				<service name="ROM" label_last="/bin/bash"> <child name="vfs_rom"/> </service>
+				<service name="ROM" label_prefix="/bin">    <child name="vfs_rom"/> </service>
+				<any-service> <parent/> <any-child/> </any-service>
+			</route>
+		</start>
+
 	</config>
 
 	<content>
 		<rom label="ld.lib.so"/>
 		<rom label="libc.lib.so"/>
 		<rom label="libm.lib.so"/>
-		<rom label="noux"/>
-		<rom label="libc_noux.lib.so"/>
+		<rom label="init"/>
+		<rom label="fs_rom"/>
 		<rom label="posix.lib.so"/>
 		<rom label="bash-minimal.tar"/>
 		<rom label="coreutils.tar"/>
+		<rom label="vfs"/>
 		<rom label="vfs.lib.so"/>
+		<rom label="vfs_pipe.lib.so"/>
 	</content>
 
 </runtime>