From cb5b688eb906e26dbfe81b6f2791dce580196d2d Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Fri, 8 May 2020 17:02:22 +0200
Subject: [PATCH] Remove <configfile> feature from init

Fixes #3753
---
 repos/os/doc/init.txt             |  8 --------
 repos/os/src/init/config.xsd      |  6 ------
 repos/os/src/lib/sandbox/child.cc | 24 +-----------------------
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/repos/os/doc/init.txt b/repos/os/doc/init.txt
index 8ea4245a9..b616503c9 100644
--- a/repos/os/doc/init.txt
+++ b/repos/os/doc/init.txt
@@ -220,14 +220,6 @@ As illustrated by this example, the use of the nested configuration feature
 enables the construction of arbitrarily complex component trees via a single
 configuration file.
 
-Alternatively to specifying all nested configurations in a single config file,
-any sub configuration can be placed in a separate file specified via the
-'configfile' node. For example:
-! <start name="nitpicker">
-!   <resource name="RAM" quantum="1M"/>
-!   <configfile name="nitpicker.config"/>
-! </start>
-
 
 Assigning subsystems to CPUs
 ============================
diff --git a/repos/os/src/init/config.xsd b/repos/os/src/init/config.xsd
index d53101fd0..3246d4d6b 100644
--- a/repos/os/src/init/config.xsd
+++ b/repos/os/src/init/config.xsd
@@ -174,12 +174,6 @@
         </xs:complexType>
        </xs:element> <!-- "exit" -->
 
-       <xs:element name="configfile">
-        <xs:complexType>
-         <xs:attribute name="name" type="xs:string" />
-        </xs:complexType>
-       </xs:element> <!-- "configfile" -->
-
        <xs:element name="provides">
         <xs:complexType>
          <xs:choice maxOccurs="unbounded">
diff --git a/repos/os/src/lib/sandbox/child.cc b/repos/os/src/lib/sandbox/child.cc
index 5361665ea..f13c92454 100644
--- a/repos/os/src/lib/sandbox/child.cc
+++ b/repos/os/src/lib/sandbox/child.cc
@@ -458,29 +458,7 @@ Sandbox::Child::resolve_session_request(Service::Name const &service_name,
 			               Session::Diag{false} };
 
 		/*
-		 * \deprecated  the support for the <configfile> tag will
-		 *              be removed
-		 */
-		if (_start_node->xml().has_sub_node("configfile")) {
-
-			typedef String<50> Name;
-			Name const rom =
-				_start_node->xml().sub_node("configfile")
-				                  .attribute_value("name", Name());
-
-			/* prevent infinite recursion */
-			if (rom == "config") {
-				error("configfile must not be named 'config'");
-				throw Service_denied();
-			}
-
-			return resolve_session_request(service_name,
-			                               prefixed_label(name(), rom));
-		}
-
-		/*
-		 * If there is neither an inline '<config>' nor a
-		 * '<configfile>' node present, we apply the regular session
+		 * If there is no inline '<config>', we apply the regular session
 		 * routing to the "config" ROM request.
 		 */
 	}