[tor-commits] [tor-browser-build/master] Display container's path when opening debug shell

[boklm at torproject.org]

commit b9512ca6c0fddee7aa61e6c1672df59ddaa0aacc
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Aug 11 12:22:54 2017 +0200

    Display container's path when opening debug shell
---
 README.HACKING | 5 ++---
 rbm.conf       | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.HACKING b/README.HACKING
index 8dde2f2..ea5d500 100644
--- a/README.HACKING
+++ b/README.HACKING
@@ -256,7 +256,6 @@ in the build containers, but vi can be used instead.
 When you press ctrl+d (twice if you opened a bash shell) the debug shell
 is closed and the container containing the failed build is removed.
 
-If you want to make a backup of the container's rootfs with the failed
-build to look at it later, you should be able to find it in
-/tmp/$UID/rbm-containers.
+The path to the container should be printed on the screen in case you
+want to backup its rootfs to be able to look at it later.
 
diff --git a/rbm.conf b/rbm.conf
index 523a005..93c5e5b 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -314,6 +314,9 @@ runc:
   remote_exec: |
     #!/bin/sh
     set -e
+    [% IF c("interactive") -%]
+      echo Container directory: [% shell_quote(c("var/container/dir")) %]
+    [% END -%]
     mkdir -p '[% c("var/container/dir", { error_if_undef => 1 }) %]'/rootfs/rbm
     echo '#!/bin/sh' > '[% c("var/container/dir") %]'/rootfs/rbm/cmd
     echo [% shell_quote(c('exec_cmd')) %] >> '[% c("var/container/dir") %]'/rootfs/rbm/cmd