diff options
| author |  netblue30 <netblue30@yahoo.com> | 2016-08-16 09:40:51 -0400 |
|---|---|---|
| committer | netblue30 <netblue30@yahoo.com> | 2016-08-16 09:40:51 -0400 |
| commit | cf6d7bdf6bc70f59696efd9de38ae8c910c71021 (patch) | |
| tree | 451f92bde6f33c0c772cb313cb734c082fb08cc9 /src | |
| parent | inox profile integration (diff) | |
| download | firejail-cf6d7bdf6bc70f59696efd9de38ae8c910c71021.tar.gz firejail-cf6d7bdf6bc70f59696efd9de38ae8c910c71021.tar.zst firejail-cf6d7bdf6bc70f59696efd9de38ae8c910c71021.zip | |
reseting fs.c - overlay merge coming up
Diffstat (limited to 'src')
| -rw-r--r-- | src/firejail/fs.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/firejail/fs.c b/src/firejail/fs.c index 98b661028..bf78a2e3b 100644 --- a/src/firejail/fs.c +++ b/src/firejail/fs.c | |||
| @@ -1110,16 +1110,14 @@ int fs_check_chroot_dir(const char *rootdir) { | |||
| 1110 | } | 1110 | } |
| 1111 | free(name); | 1111 | free(name); |
| 1112 | 1112 | ||
| 1113 | // check shell (test not needed. We already test access in main.c) | 1113 | // check /bin/bash |
| 1114 | //if (!arg_shell_none) { | 1114 | // if (asprintf(&name, "%s/bin/bash", rootdir) == -1) |
| 1115 | // if (asprintf(&name, "%s%s", rootdir, (char *)&cfg.shell) == -1) | 1115 | // errExit("asprintf"); |
| 1116 | // errExit("asprintf"); | 1116 | // if (stat(name, &s) == -1) { |
| 1117 | // if (stat(name, &s) == -1) { | 1117 | // fprintf(stderr, "Error: cannot find /bin/bash in chroot directory\n"); |
| 1118 | // fprintf(stderr, "Error: cannot find %s in chroot directory\n", name); | 1118 | // return 1; |
| 1119 | // return 1; | 1119 | // } |
| 1120 | // } | 1120 | // free(name); |
| 1121 | // free(name); | ||
| 1122 | //} | ||
| 1123 | 1121 | ||
| 1124 | // check x11 socket directory | 1122 | // check x11 socket directory |
| 1125 | if (getenv("FIREJAIL_X11")) { | 1123 | if (getenv("FIREJAIL_X11")) { |