README.md

diff --git a/README.md b/README.md
index 4b53054b462cd3ee280c0a710bd7b86ed9b98479..4f04914659fbf97f840fcf2078be33ca042c0d8d 100644 (file)
--- a/README.md
+++ b/README.md
@@ -19,27 +19,37 @@ This is NOT an official Google product.
 
 + Client:
 ```
-  $ nc 127.0.0.1 9000
-  / $ ifconfig
-  / $ ifconfig -a
-  lo    Link encap:Local Loopback
-        LOOPBACK  MTU:65536  Metric:1
-           RX packets:0 errors:0 dropped:0 overruns:0 frame:0
-           TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0
-           RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
+ $ nc 127.0.0.1 9000
+ / $ ifconfig
+ / $ ifconfig -a
+ lo    Link encap:Local Loopback
+       LOOPBACK  MTU:65536  Metric:1
+       RX packets:0 errors:0 dropped:0 overruns:0 frame:0
+       TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0
+       RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
+ / $ ps wuax
+ PID   USER     COMMAND
+ 1 99999    /bin/sh -i
+ 2 99999    {busybox} ps wuax
+ / $ 
+
 ```
 
 #### Isolation of local processes
 ```
  $ ./nsjail -Mo --chroot /chroot/ --user 99999 --group 99999 -- /bin/sh -i
-  / $ ifconfig -a
-  lo    Link encap:Local Loopback
-        LOOPBACK  MTU:65536  Metric:1
-           RX packets:0 errors:0 dropped:0 overruns:0 frame:0
-           TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0
-           RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
+ / $ ifconfig -a
+ lo    Link encap:Local Loopback
+       LOOPBACK  MTU:65536  Metric:1
+       RX packets:0 errors:0 dropped:0 overruns:0 frame:0
+       TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0
+       RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
  / $ id
  uid=99999 gid=99999
+ / $ ps wuax
+ PID   USER     COMMAND
+ 1 99999    /bin/sh -i
+ 2 99999    {busybox} ps wuax
  / $exit
  $
 ```
@@ -49,9 +59,17 @@ This is NOT an official Google product.
  $ ./nsjail -Mr --chroot /chroot/ --user 99999 --group 99999 -- /bin/sh -i
  BusyBox v1.21.1 (Ubuntu 1:1.21.0-1ubuntu1) built-in shell (ash)
  Enter 'help' for a list of built-in commands.
+ / $ ps wuax
+ PID   USER     COMMAND
+ 1 99999    /bin/sh -i
+ 2 99999    {busybox} ps wuax
  / $ exit
  BusyBox v1.21.1 (Ubuntu 1:1.21.0-1ubuntu1) built-in shell (ash)
  Enter 'help' for a list of built-in commands.
+ / $ ps wuax
+ PID   USER     COMMAND
+ 1 99999    /bin/sh -i
+ 2 99999    {busybox} ps wuax
  / $
 ```
 

diff --git a/contain.c b/contain.c
index e8be0e7dd418040cd0674c2eec69e867add02eaa..8ac1f4d18684a89e3bb17738e5c51751e8ba3858 100644 (file)
--- a/contain.c
+++ b/contain.c
@@ -236,6 +236,8 @@ bool containMountFS(struct nsjconf_t * nsjconf)
                PLOG_E("chdir('/')");
                return false;
        }
+       /* It only makes sense with "--chroot /", so don't worry about erorrs */
+       umount2(destdir, MNT_DETACH);
 
        for (size_t i = 0; i < nsjconf->tmpfsmountpts->fs_count; i++) {
                if (mkdir(nsjconf->tmpfsmountpts->mountpt[i], 0700) == -1 && errno != EEXIST) {