diff options
author | 2015-08-16 08:56:48 -0400 | |
---|---|---|
committer | 2015-08-16 08:56:48 -0400 | |
commit | 980979d77ebd30ca1d6b518d48068a1e3660a4e8 (patch) | |
tree | 557800e0132aa52641e1e2886a939164e4c20309 /src/firejail/firejail.h | |
parent | admin work (diff) | |
download | firejail-980979d77ebd30ca1d6b518d48068a1e3660a4e8.tar.gz firejail-980979d77ebd30ca1d6b518d48068a1e3660a4e8.tar.zst firejail-980979d77ebd30ca1d6b518d48068a1e3660a4e8.zip |
--overlay rework, adding a persistent directory; implemented --overlay-tmpfs option
Diffstat (limited to 'src/firejail/firejail.h')
-rw-r--r-- | src/firejail/firejail.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index a1833b4bc..7eb4786e6 100644 --- a/src/firejail/firejail.h +++ b/src/firejail/firejail.h | |||
@@ -26,7 +26,6 @@ | |||
26 | #define RO_DIR "/tmp/firejail/firejail.ro.dir" | 26 | #define RO_DIR "/tmp/firejail/firejail.ro.dir" |
27 | #define RO_FILE "/tmp/firejail/firejail.ro.file" | 27 | #define RO_FILE "/tmp/firejail/firejail.ro.file" |
28 | #define MNT_DIR "/tmp/firejail/mnt" | 28 | #define MNT_DIR "/tmp/firejail/mnt" |
29 | #define OVERLAY_DIR "/tmp/firejail/overlay" | ||
30 | #define HOME_DIR "/tmp/firejail/mnt/home" | 29 | #define HOME_DIR "/tmp/firejail/mnt/home" |
31 | #define ETC_DIR "/tmp/firejail/mnt/etc" | 30 | #define ETC_DIR "/tmp/firejail/mnt/etc" |
32 | #define MAX_INCLUDE_LEVEL 6 | 31 | #define MAX_INCLUDE_LEVEL 6 |
@@ -70,6 +69,7 @@ typedef struct config_t { | |||
70 | char *home_private_keep; // keep list for private home directory | 69 | char *home_private_keep; // keep list for private home directory |
71 | char *etc_private_keep; // keep list for private etc directory | 70 | char *etc_private_keep; // keep list for private etc directory |
72 | char *cwd; // current working directory | 71 | char *cwd; // current working directory |
72 | char *overlay_dir; | ||
73 | 73 | ||
74 | // networking | 74 | // networking |
75 | char *hostname; | 75 | char *hostname; |
@@ -109,11 +109,13 @@ static inline int any_bridge_configured(void) { | |||
109 | else | 109 | else |
110 | return 0; | 110 | return 0; |
111 | } | 111 | } |
112 | |||
112 | extern int arg_private; // mount private /home and /tmp directory | 113 | extern int arg_private; // mount private /home and /tmp directory |
113 | extern int arg_debug; // print debug messages | 114 | extern int arg_debug; // print debug messages |
114 | extern int arg_nonetwork; // --net=none | 115 | extern int arg_nonetwork; // --net=none |
115 | extern int arg_command; // -c | 116 | extern int arg_command; // -c |
116 | extern int arg_overlay; // --overlay | 117 | extern int arg_overlay; // overlay option |
118 | extern int arg_overlay_keep; // place overlay diff directory in ~/.firejail | ||
117 | extern int arg_zsh; // use zsh as default shell | 119 | extern int arg_zsh; // use zsh as default shell |
118 | extern int arg_csh; // use csh as default shell | 120 | extern int arg_csh; // use csh as default shell |
119 | 121 | ||
@@ -358,3 +360,4 @@ void fs_check_etc_list(void); | |||
358 | void fs_private_etc_list(void); | 360 | void fs_private_etc_list(void); |
359 | 361 | ||
360 | #endif | 362 | #endif |
363 | |||