From f3cce999335358f3dfc3e3e371c14ba809932d9e Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Tue, 9 Feb 2016 08:01:40 +0100
Subject: [PATCH] Adapt terminal_mux.run to changes in cli_monitor

Subsystems are now configured via .subsystem files in the VFS directory
/subsystems. The adaption uses one <inline> node per subsystem.
---
 repos/gems/run/terminal_mux.run | 77 ++++++++++++++++++---------------
 1 file changed, 43 insertions(+), 34 deletions(-)

diff --git a/repos/gems/run/terminal_mux.run b/repos/gems/run/terminal_mux.run
index 8e61b8f7d..ecee02c51 100644
--- a/repos/gems/run/terminal_mux.run
+++ b/repos/gems/run/terminal_mux.run
@@ -92,45 +92,54 @@ append config {
 			<resource name="RAM" quantum="100M"/>
 			<config>
 				<preservation name="RAM" quantum="16M" />
-				<subsystem name="noux" help="VIM executed in the noux runtime">
-					<resource name="RAM" quantum="16M" />
-					<config>
-						<fstab> <tar name="vim.tar" /> </fstab>
-						<start name="/bin/vim">
-							<env name="TERM" value="linux" />
+				<vfs>
+					<dir name="subsystems">
+						<inline name="noux.subsystem">
+							<subsystem name="noux" help="VIM executed in the noux runtime">
+								<resource name="RAM" quantum="16M" />
+								<config>
+									<fstab> <tar name="vim.tar" /> </fstab>
+									<start name="/bin/vim">
+										<env name="TERM" value="linux" />
 
-							<!-- Deactivate the loading of plugins. Otherwise, vim will
-							     attempt to use a sub shell for pattern matching -->
-							<arg value="--noplugin" />
+										<!-- Deactivate the loading of plugins. Otherwise, vim will
+										     attempt to use a sub shell for pattern matching -->
+										<arg value="--noplugin" />
 
-							<!-- Do not use swap file. Any attempt to create of would
-							     fail because we are on a read-only file system -->
-							<arg value="-n" />
+										<!-- Do not use swap file. Any attempt to create of would
+										     fail because we are on a read-only file system -->
+										<arg value="-n" />
 
-							<!-- Use the nocompatible mode, which is much nicer than
-							     the plain vi mode -->
-							<arg value="-N" />
+										<!-- Use the nocompatible mode, which is much nicer than
+										     the plain vi mode -->
+										<arg value="-N" />
 
-							<!-- Permanently display status bar -->
-							<arg value="--cmd" />
-							<arg value="set laststatus=2" />
+										<!-- Permanently display status bar -->
+										<arg value="--cmd" />
+										<arg value="set laststatus=2" />
 
-							<!-- Enable highlighted search results -->
-							<arg value="--cmd" />
-							<arg value="set hls" />
-
-						</start>
-					</config>
-				</subsystem>
-				<subsystem name="signal" help="signalling test program">
-					<resource name="RAM" quantum="5M" />
-					<binary name="test-signal" />
-				</subsystem>
-				<subsystem name="ram_eater" help="resource-yield test program">
-					<resource name="RAM" quantum="25M" />
-					<binary name="test-resource_yield" />
-					<config child="yes" expand="yes" period_ms="100" />
-				</subsystem>
+										<!-- Enable highlighted search results -->
+										<arg value="--cmd" />
+										<arg value="set hls" />
+									</start>
+								</config>
+							</subsystem>
+						</inline>
+						<inline name="ram_eater.subsystem">
+							<subsystem name="ram_eater" help="resource-yield test program">
+								<resource name="RAM" quantum="25M" />
+								<binary name="test-resource_yield" />
+								<config child="yes" expand="yes" period_ms="100" />
+							</subsystem>
+						</inline>
+						<inline name="signal.subsystem">
+							<subsystem name="signal" help="signalling test program">
+								<resource name="RAM" quantum="5M" />
+								<binary name="test-signal" />
+							</subsystem>
+						</inline>
+					</dir>
+				</vfs>
 			</config>
 			<route>
 				<any-service> <child name="terminal_mux" /> <any-child/> <parent/> </any-service>