From 8d95532d9a53d1284b777aba46d8ceb0eeb0891f Mon Sep 17 00:00:00 2001
From: jiceatscion <139873336+jiceatscion@users.noreply.github.com>
Date: Mon, 28 Aug 2023 18:33:39 +0200
Subject: [PATCH] scion.sh: do a more complete shutdown by default (#4382)

---
 scion.sh | 13 +++----------
 tools/dc |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/scion.sh b/scion.sh
index 371f410274..c437e32125 100755
--- a/scion.sh
+++ b/scion.sh
@@ -11,14 +11,7 @@ cmd_bazel_remote() {
 
 cmd_topo_clean() {
     set -e
-    if is_docker_be; then
-        echo "Shutting down dockerized topology..."
-        ./tools/quiet ./tools/dc down || true
-    else
-        ./tools/quiet tools/supervisor.sh shutdown
-        run_teardown
-    fi
-    stop_jaeger
+    cmd_stop || true
     rm -rf traces/*
     mkdir -p logs traces gen gen-cache gen-certs
     find gen gen-cache gen-certs -mindepth 1 -maxdepth 1 -exec rm -r {} +
@@ -109,9 +102,9 @@ run_teardown() {
 cmd_stop() {
     echo "Terminating this run of the SCION infrastructure"
     if is_docker_be; then
-        ./tools/quiet ./tools/dc stop 'scion*'
+        ./tools/quiet ./tools/dc down
     else
-        ./tools/quiet tools/supervisor.sh stop all
+        ./tools/quiet tools/supervisor.sh shutdown
         run_teardown
     fi
     stop_jaeger
diff --git a/tools/dc b/tools/dc
index 2b21ec3f3d..7901082a31 100755
--- a/tools/dc
+++ b/tools/dc
@@ -59,7 +59,7 @@ cmd_stop() {
 }
 
 cmd_down() {
-    cmd_scion down -v
+    cmd_scion down -v --remove-orphans
 }
 
 cmd_run() {