From e6b87e9d20fb8564992066ea42a3b13369e072ac Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Fri, 19 Jan 2018 19:23:39 +0100
Subject: [PATCH] depot_query.run: use label_last

---
 repos/gems/run/depot_query.run          | 16 ++++++----------
 repos/gems/src/app/depot_deploy/main.cc | 14 +++++++-------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/repos/gems/run/depot_query.run b/repos/gems/run/depot_query.run
index 296b7e2357..5d1f1731ae 100644
--- a/repos/gems/run/depot_query.run
+++ b/repos/gems/run/depot_query.run
@@ -1,4 +1,4 @@
-build { app/depot_query app/depot_deploy }
+build { init app/depot_query app/depot_deploy }
 
 create_boot_directory
 
@@ -88,10 +88,8 @@ install_config {
 				</parent-provides>
 			</static>
 			<common_routes>
-				<service name="ROM" unscoped_label="init">       <parent/> </service>
-				<service name="ROM" unscoped_label="ld.lib.so">  <parent/> </service>
-				<service name="ROM" label_suffix="init">      <parent/> </service>
-				<service name="ROM" label_suffix="ld.lib.so"> <parent/> </service>
+				<service name="ROM" label_last="ld.lib.so"> <parent/> </service>
+				<service name="ROM" label_last="init">      <parent/> </service>
 				<service name="CPU">   <parent/> </service>
 				<service name="PD">    <parent/> </service>
 				<service name="LOG">   <parent/> </service>
@@ -108,10 +106,8 @@ install_config {
 		<resource name="RAM" quantum="64M"/>
 		<binary name="init"/>
 		<route>
-			<service name="ROM" unscoped_label="ld.lib.so">  <parent/> </service>
-			<service name="ROM" unscoped_label="init">       <parent/> </service>
-			<service name="ROM" label_suffix="ld.lib.so"> <parent/> </service>
-			<service name="ROM" label_suffix="init">      <parent/> </service>
+			<service name="ROM" label_last="ld.lib.so"> <parent/> </service>
+			<service name="ROM" label_last="init">      <parent/> </service>
 			<service name="ROM" label="config"> <child name="report_rom"/> </service>
 			<service name="ROM">   <child name="fs_rom"/> </service>
 			<service name="Timer"> <child name="timer"/>  </service>
@@ -121,7 +117,7 @@ install_config {
 
 </config>}
 
-build_boot_image { depot_query depot_deploy }
+build_boot_image { init depot_query depot_deploy }
 
 run_genode_until {.*child "test-fs_report" exited with exit value 0.*\n} 30
 
diff --git a/repos/gems/src/app/depot_deploy/main.cc b/repos/gems/src/app/depot_deploy/main.cc
index 9492003046..df8445bab8 100644
--- a/repos/gems/src/app/depot_deploy/main.cc
+++ b/repos/gems/src/app/depot_deploy/main.cc
@@ -29,7 +29,7 @@ struct Depot_deploy::Main
 	Attached_rom_dataspace _config    { _env, "config" };
 	Attached_rom_dataspace _blueprint { _env, "blueprint" };
 
-	Reporter _init_config_reporter { _env, "config", "init.config" };
+	Reporter _init_config_reporter { _env, "config", "init.config", 16*1024 };
 
 	Signal_handler<Main> _config_handler {
 		_env.ep(), *this, &Main::_handle_config };
@@ -143,6 +143,11 @@ void Depot_deploy::Main::_gen_start_node(Xml_generator &xml, Xml_node pkg, Xml_n
 			});
 		}
 
+		/*
+		 * Add common routes as defined in our config.
+		 */
+		xml.append(common.content_base(), common.content_size());
+
 		/*
 		 * Add ROM routing rule with the label rewritten to
 		 * the path within the depot.
@@ -159,16 +164,11 @@ void Depot_deploy::Main::_gen_start_node(Xml_generator &xml, Xml_node pkg, Xml_n
 
 			xml.node("service", [&] () {
 				xml.attribute("name", "ROM");
-				xml.attribute("label", label);
+				xml.attribute("label_last", label);
 				xml.node("parent", [&] () {
 					xml.attribute("label", path); });
 			});
 		});
-
-		/*
-		 * Add common routes as defined in our config.
-		 */
-		xml.append(common.content_base(), common.content_size());
 	});
 }