From fbd403a112f56260bdb316cb4c8a70b5445979f1 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Tue, 17 Mar 2020 15:07:53 +0100
Subject: [PATCH] fixup "Remove noux from SSH exec terminal" (remove untested
 parts, add to autopilot)

---
 repos/gems/run/ssh_exec_channel.run | 29 -----------------------------
 tool/autopilot.list                 |  1 +
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/repos/gems/run/ssh_exec_channel.run b/repos/gems/run/ssh_exec_channel.run
index 953c7121d..ff1932340 100644
--- a/repos/gems/run/ssh_exec_channel.run
+++ b/repos/gems/run/ssh_exec_channel.run
@@ -31,7 +31,6 @@ import_from_depot [depot_user]/src/[base_src] \
                   [depot_user]/src/libc \
                   [depot_user]/src/libcrypto \
                   [depot_user]/src/libssh \
-                  [depot_user]/src/noux \
                   [depot_user]/src/platform_drv \
                   [depot_user]/src/posix \
                   [depot_user]/src/ram_fs \
@@ -188,34 +187,6 @@ set config {
 			<service name="ROM"> <parent/> </service>
 		</route>
 	</start>
-
-	<start name="always-running-noux" caps="500">
-		<binary name="noux"/>
-		<resource name="RAM" quantum="64M"/>
-		<config>
-			<fstab>
-				<tar name="bash.tar" />
-				<tar name="coreutils-minimal.tar" />
-				<tar name="vim-minimal.tar" />
-			</fstab>
-			<start name="/bin/bash">
-				<env name="TERM" value="screen"/>
-				<env name="HOME" value="/"/>
-				<env name="IGNOREEOF" value="3"/>
-			</start>
-		</config>
-		<route>
-			<service name="File_system"> <child name="ram_fs"/> </service>
-			<service name="ROM" label="config"> <child name="report_rom"/> </service>
-			<service name="Terminal"> <child name="ssh_terminal"/> </service>
-			<service name="Timer"> <child name="timer"/> </service>
-			<service name="CPU"> <parent/> </service>
-			<service name="LOG"> <parent/> </service>
-			<service name="PD"> <parent/> </service>
-			<service name="RM"> <parent/> </service>
-			<service name="ROM"> <parent/> </service>
-		</route>
-	</start>
 }
 
 append_platform_drv_config
diff --git a/tool/autopilot.list b/tool/autopilot.list
index 644de543f..15480cf42 100644
--- a/tool/autopilot.list
+++ b/tool/autopilot.list
@@ -48,6 +48,7 @@ rtc
 rump_ext2
 sd_card_bench
 seoul-auto
+ssh_exec_channel
 smartcard
 smbios_decoder
 smp