diff options
author | netblue30 <netblue30@yahoo.com> | 2015-11-08 12:20:28 -0500 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2015-11-08 12:20:28 -0500 |
commit | fa56cd63c8d273a4039a1c62684715cf3e23b1ad (patch) | |
tree | d5c467f54a6f50c7d3425de6a6bea8b4eb348ed3 /src | |
parent | 0.9.34 released (diff) | |
download | firejail-fa56cd63c8d273a4039a1c62684715cf3e23b1ad.tar.gz firejail-fa56cd63c8d273a4039a1c62684715cf3e23b1ad.tar.zst firejail-fa56cd63c8d273a4039a1c62684715cf3e23b1ad.zip |
move firejail directory form /tmp to /run
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/firejail.h | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h index 18fc4baf0..e3a56704f 100644 --- a/src/firejail/firejail.h +++ b/src/firejail/firejail.h | |||
@@ -22,28 +22,28 @@ | |||
22 | #include "../include/common.h" | 22 | #include "../include/common.h" |
23 | 23 | ||
24 | // filesystem | 24 | // filesystem |
25 | #define FIREJAIL_DIR "/tmp/firejail" | 25 | #define FIREJAIL_DIR "/run/firejail" |
26 | #define NETWORK_LOCK_FILE "/tmp/firejail/firejail.lock" | 26 | #define NETWORK_LOCK_FILE "/run/firejail/firejail.lock" |
27 | #define RO_DIR "/tmp/firejail/firejail.ro.dir" | 27 | #define RO_DIR "/run/firejail/firejail.ro.dir" |
28 | #define RO_FILE "/tmp/firejail/firejail.ro.file" | 28 | #define RO_FILE "/run/firejail/firejail.ro.file" |
29 | #define MNT_DIR "/tmp/firejail/mnt" // a tmpfs is mounted on this directory before any of the files below are created | 29 | #define MNT_DIR "/run/firejail/mnt" // a tmpfs is mounted on this directory before any of the files below are created |
30 | #define SECCOMP_CFG "/tmp/firejail/mnt/seccomp" | 30 | #define SECCOMP_CFG "/run/firejail/mnt/seccomp" |
31 | #define CGROUP_CFG "/tmp/firejail/mnt/cgroup" | 31 | #define CGROUP_CFG "/run/firejail/mnt/cgroup" |
32 | #define CPU_CFG "/tmp/firejail/mnt/cpu" | 32 | #define CPU_CFG "/run/firejail/mnt/cpu" |
33 | #define GROUPS_CFG "/tmp/firejail/mnt/groups" | 33 | #define GROUPS_CFG "/run/firejail/mnt/groups" |
34 | #define PROTOCOL_CFG "/tmp/firejail/mnt/protocol" | 34 | #define PROTOCOL_CFG "/run/firejail/mnt/protocol" |
35 | #define CP_COMMAND "/tmp/firejail/mnt/cp" | 35 | #define CP_COMMAND "/run/firejail/mnt/cp" |
36 | #define HOME_DIR "/tmp/firejail/mnt/home" | 36 | #define HOME_DIR "/run/firejail/mnt/home" |
37 | #define ETC_DIR "/tmp/firejail/mnt/etc" | 37 | #define ETC_DIR "/run/firejail/mnt/etc" |
38 | #define BIN_DIR "/tmp/firejail/mnt/bin" | 38 | #define BIN_DIR "/run/firejail/mnt/bin" |
39 | #define DRI_DIR "/tmp/firejail/mnt/dri" | 39 | #define DRI_DIR "/run/firejail/mnt/dri" |
40 | #define PULSE_DIR "/tmp/firejail/mnt/pulse" | 40 | #define PULSE_DIR "/run/firejail/mnt/pulse" |
41 | #define WHITELIST_HOME_DIR "/tmp/firejail/mnt/whome" | 41 | #define WHITELIST_HOME_DIR "/run/firejail/mnt/whome" |
42 | #define XAUTHORITY_FILE "/tmp/firejail/mnt/.Xauthority" | 42 | #define XAUTHORITY_FILE "/run/firejail/mnt/.Xauthority" |
43 | #define HOSTNAME_FILE "/tmp/firejail/mnt/hostname" | 43 | #define HOSTNAME_FILE "/run/firejail/mnt/hostname" |
44 | #define RESOLVCONF_FILE "/tmp/firejail/mnt/resolv.conf" | 44 | #define RESOLVCONF_FILE "/run/firejail/mnt/resolv.conf" |
45 | #define LDPRELOAD_FILE "/tmp/firejail/mnt/ld.so.preload" | 45 | #define LDPRELOAD_FILE "/run/firejail/mnt/ld.so.preload" |
46 | #define UTMP_FILE "/tmp/firejail/mnt/utmp" | 46 | #define UTMP_FILE "/run/firejail/mnt/utmp" |
47 | 47 | ||
48 | // profiles | 48 | // profiles |
49 | #define DEFAULT_USER_PROFILE "generic" | 49 | #define DEFAULT_USER_PROFILE "generic" |
@@ -163,7 +163,7 @@ static inline int any_interface_configured(void) { | |||
163 | return 0; | 163 | return 0; |
164 | } | 164 | } |
165 | 165 | ||
166 | extern int arg_private; // mount private /home and /tmp directory | 166 | extern int arg_private; // mount private /home |
167 | extern int arg_debug; // print debug messages | 167 | extern int arg_debug; // print debug messages |
168 | extern int arg_nonetwork; // --net=none | 168 | extern int arg_nonetwork; // --net=none |
169 | extern int arg_command; // -c | 169 | extern int arg_command; // -c |
@@ -233,9 +233,9 @@ int net_config_mac(const char *ifname, const unsigned char mac[6]); | |||
233 | int net_get_mac(const char *ifname, unsigned char mac[6]); | 233 | int net_get_mac(const char *ifname, unsigned char mac[6]); |
234 | 234 | ||
235 | // fs.c | 235 | // fs.c |
236 | // build /tmp/firejail directory | 236 | // build /run/firejail directory |
237 | void fs_build_firejail_dir(void); | 237 | void fs_build_firejail_dir(void); |
238 | // build /tmp/firejail/mnt directory | 238 | // build /run/firejail/mnt directory |
239 | void fs_build_mnt_dir(void); | 239 | void fs_build_mnt_dir(void); |
240 | // grab a copy of cp command | 240 | // grab a copy of cp command |
241 | void fs_build_cp_command(void); | 241 | void fs_build_cp_command(void); |