From e9b64aa00ae12cbebcc2e7953bfb9d546de1a0fc Mon Sep 17 00:00:00 2001 From: netblue30 Date: Wed, 24 Jan 2018 09:56:03 -0500 Subject: --overlay clanup --- src/firejail/firejail.h | 2 +- src/firejail/fs.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src') 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 @@ #define RUN_PASSWD_FILE "/run/firejail/mnt/passwd" #define RUN_GROUP_FILE "/run/firejail/mnt/group" #define RUN_FSLOGGER_FILE "/run/firejail/mnt/fslogger" - +#define RUN_OVERLAY_ROOT "/run/firejail/mnt/oroot" // 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) { if (major == 3 && minor < 18) oldkernel = 1; - char *oroot; - if(asprintf(&oroot, "%s/oroot", RUN_MNT_DIR) == -1) - errExit("asprintf"); + char *oroot = RUN_OVERLAY_ROOT; mkdir_attr(oroot, 0755, 0, 0); struct stat s; @@ -1028,7 +1026,6 @@ void fs_overlayfs(void) { // cleanup and exit free(option); - free(oroot); free(odiff); } #endif -- cgit v1.2.3-54-g00ecf