From 9c88891baf6b0a180c4e739e1e4fa30b2f9caa9d Mon Sep 17 00:00:00 2001
From: Christian Prochaska <christian.prochaska@genode-labs.com>
Date: Wed, 31 Aug 2016 12:03:56 +0200
Subject: [PATCH] autopilot: always add '--autopilot' run option

...not just in case RUN_OPT_AUTOPILOT was set.

Issue #2076
---
 tool/autopilot | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tool/autopilot b/tool/autopilot
index cada15ece3..3e862ceaa7 100755
--- a/tool/autopilot
+++ b/tool/autopilot
@@ -309,8 +309,10 @@ foreach platform $platforms {
 	if {[info exists ::env(RUN_OPT_AUTOPILOT)]} {
 		set kernel [exec echo $platform |& sed {s/_.*//}]
 
-		exec echo "RUN_OPT=--include boot_dir/$kernel --autopilot $::env(RUN_OPT_AUTOPILOT)" >> $build_conf
+		exec echo "RUN_OPT=--include boot_dir/$kernel $::env(RUN_OPT_AUTOPILOT)" >> $build_conf
 	}
+
+	exec echo "RUN_OPT += --autopilot" >> $build_conf
 }