diff options
| author |  netblue30 <netblue30@yahoo.com> | 2018-01-24 09:56:03 -0500 |
|---|---|---|
| committer | netblue30 <netblue30@yahoo.com> | 2018-01-24 09:56:03 -0500 |
| commit | e9b64aa00ae12cbebcc2e7953bfb9d546de1a0fc (patch) | |
| tree | 39dc49b174c77dc5a95c8e079948e9e1046b5d99 /src | |
| parent | added firejail --apparmor.print and firemon --apparmor (diff) | |
| download | firejail-e9b64aa00ae12cbebcc2e7953bfb9d546de1a0fc.tar.gz firejail-e9b64aa00ae12cbebcc2e7953bfb9d546de1a0fc.tar.zst firejail-e9b64aa00ae12cbebcc2e7953bfb9d546de1a0fc.zip | |
--overlay clanup
Diffstat (limited to 'src')
| -rw-r--r-- | src/firejail/firejail.h | 2 | ||||
| -rw-r--r-- | src/firejail/fs.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index 5d586830a..97e740e6b 100644 --- a/src/firejail/firejail.h +++ b/src/firejail/firejail.h | |||
| @@ -98,7 +98,7 @@ | |||
| 98 | #define RUN_PASSWD_FILE "/run/firejail/mnt/passwd" | 98 | #define RUN_PASSWD_FILE "/run/firejail/mnt/passwd" |
| 99 | #define RUN_GROUP_FILE "/run/firejail/mnt/group" | 99 | #define RUN_GROUP_FILE "/run/firejail/mnt/group" |
| 100 | #define RUN_FSLOGGER_FILE "/run/firejail/mnt/fslogger" | 100 | #define RUN_FSLOGGER_FILE "/run/firejail/mnt/fslogger" |
| 101 | 101 | #define RUN_OVERLAY_ROOT "/run/firejail/mnt/oroot" | |
| 102 | 102 | ||
| 103 | 103 | ||
| 104 | // profiles | 104 | // profiles |
diff --git a/src/firejail/fs.c b/src/firejail/fs.c index 68e5c7d3a..4246fbe5b 100644 --- a/src/firejail/fs.c +++ b/src/firejail/fs.c | |||
| @@ -829,9 +829,7 @@ void fs_overlayfs(void) { | |||
| 829 | if (major == 3 && minor < 18) | 829 | if (major == 3 && minor < 18) |
| 830 | oldkernel = 1; | 830 | oldkernel = 1; |
| 831 | 831 | ||
| 832 | char *oroot; | 832 | char *oroot = RUN_OVERLAY_ROOT; |
| 833 | if(asprintf(&oroot, "%s/oroot", RUN_MNT_DIR) == -1) | ||
| 834 | errExit("asprintf"); | ||
| 835 | mkdir_attr(oroot, 0755, 0, 0); | 833 | mkdir_attr(oroot, 0755, 0, 0); |
| 836 | 834 | ||
| 837 | struct stat s; | 835 | struct stat s; |
| @@ -1028,7 +1026,6 @@ void fs_overlayfs(void) { | |||
| 1028 | 1026 | ||
| 1029 | // cleanup and exit | 1027 | // cleanup and exit |
| 1030 | free(option); | 1028 | free(option); |
| 1031 | free(oroot); | ||
| 1032 | free(odiff); | 1029 | free(odiff); |
| 1033 | } | 1030 | } |
| 1034 | #endif | 1031 | #endif |