diff options
-rwxr-xr-x | configure | 18 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/firejail/firejail.h | 50 |
3 files changed, 35 insertions, 35 deletions
@@ -1,6 +1,6 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
3 | # Generated by GNU Autoconf 2.69 for firejail 0.9.34. | 3 | # Generated by GNU Autoconf 2.69 for firejail 0.9.35. |
4 | # | 4 | # |
5 | # Report bugs to <netblue30@yahoo.com>. | 5 | # Report bugs to <netblue30@yahoo.com>. |
6 | # | 6 | # |
@@ -580,8 +580,8 @@ MAKEFLAGS= | |||
580 | # Identity of this package. | 580 | # Identity of this package. |
581 | PACKAGE_NAME='firejail' | 581 | PACKAGE_NAME='firejail' |
582 | PACKAGE_TARNAME='firejail' | 582 | PACKAGE_TARNAME='firejail' |
583 | PACKAGE_VERSION='0.9.34' | 583 | PACKAGE_VERSION='0.9.35' |
584 | PACKAGE_STRING='firejail 0.9.34' | 584 | PACKAGE_STRING='firejail 0.9.35' |
585 | PACKAGE_BUGREPORT='netblue30@yahoo.com' | 585 | PACKAGE_BUGREPORT='netblue30@yahoo.com' |
586 | PACKAGE_URL='http://github.com/netblue30/firejail' | 586 | PACKAGE_URL='http://github.com/netblue30/firejail' |
587 | 587 | ||
@@ -1238,7 +1238,7 @@ if test "$ac_init_help" = "long"; then | |||
1238 | # Omit some internal or obsolete options to make the list less imposing. | 1238 | # Omit some internal or obsolete options to make the list less imposing. |
1239 | # This message is too long to be a string in the A/UX 3.1 sh. | 1239 | # This message is too long to be a string in the A/UX 3.1 sh. |
1240 | cat <<_ACEOF | 1240 | cat <<_ACEOF |
1241 | \`configure' configures firejail 0.9.34 to adapt to many kinds of systems. | 1241 | \`configure' configures firejail 0.9.35 to adapt to many kinds of systems. |
1242 | 1242 | ||
1243 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1243 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1244 | 1244 | ||
@@ -1299,7 +1299,7 @@ fi | |||
1299 | 1299 | ||
1300 | if test -n "$ac_init_help"; then | 1300 | if test -n "$ac_init_help"; then |
1301 | case $ac_init_help in | 1301 | case $ac_init_help in |
1302 | short | recursive ) echo "Configuration of firejail 0.9.34:";; | 1302 | short | recursive ) echo "Configuration of firejail 0.9.35:";; |
1303 | esac | 1303 | esac |
1304 | cat <<\_ACEOF | 1304 | cat <<\_ACEOF |
1305 | 1305 | ||
@@ -1389,7 +1389,7 @@ fi | |||
1389 | test -n "$ac_init_help" && exit $ac_status | 1389 | test -n "$ac_init_help" && exit $ac_status |
1390 | if $ac_init_version; then | 1390 | if $ac_init_version; then |
1391 | cat <<\_ACEOF | 1391 | cat <<\_ACEOF |
1392 | firejail configure 0.9.34 | 1392 | firejail configure 0.9.35 |
1393 | generated by GNU Autoconf 2.69 | 1393 | generated by GNU Autoconf 2.69 |
1394 | 1394 | ||
1395 | Copyright (C) 2012 Free Software Foundation, Inc. | 1395 | Copyright (C) 2012 Free Software Foundation, Inc. |
@@ -1691,7 +1691,7 @@ cat >config.log <<_ACEOF | |||
1691 | This file contains any messages produced by compilers while | 1691 | This file contains any messages produced by compilers while |
1692 | running configure, to aid debugging if configure makes a mistake. | 1692 | running configure, to aid debugging if configure makes a mistake. |
1693 | 1693 | ||
1694 | It was created by firejail $as_me 0.9.34, which was | 1694 | It was created by firejail $as_me 0.9.35, which was |
1695 | generated by GNU Autoconf 2.69. Invocation command line was | 1695 | generated by GNU Autoconf 2.69. Invocation command line was |
1696 | 1696 | ||
1697 | $ $0 $@ | 1697 | $ $0 $@ |
@@ -4102,7 +4102,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |||
4102 | # report actual input values of CONFIG_FILES etc. instead of their | 4102 | # report actual input values of CONFIG_FILES etc. instead of their |
4103 | # values after options handling. | 4103 | # values after options handling. |
4104 | ac_log=" | 4104 | ac_log=" |
4105 | This file was extended by firejail $as_me 0.9.34, which was | 4105 | This file was extended by firejail $as_me 0.9.35, which was |
4106 | generated by GNU Autoconf 2.69. Invocation command line was | 4106 | generated by GNU Autoconf 2.69. Invocation command line was |
4107 | 4107 | ||
4108 | CONFIG_FILES = $CONFIG_FILES | 4108 | CONFIG_FILES = $CONFIG_FILES |
@@ -4156,7 +4156,7 @@ _ACEOF | |||
4156 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 4156 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
4157 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 4157 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
4158 | ac_cs_version="\\ | 4158 | ac_cs_version="\\ |
4159 | firejail config.status 0.9.34 | 4159 | firejail config.status 0.9.35 |
4160 | configured by $0, generated by GNU Autoconf 2.69, | 4160 | configured by $0, generated by GNU Autoconf 2.69, |
4161 | with options \\"\$ac_cs_config\\" | 4161 | with options \\"\$ac_cs_config\\" |
4162 | 4162 | ||
diff --git a/configure.ac b/configure.ac index 29fbf931f..589451cab 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,5 +1,5 @@ | |||
1 | AC_PREREQ([2.68]) | 1 | AC_PREREQ([2.68]) |
2 | AC_INIT(firejail, 0.9.34, netblue30@yahoo.com, , http://github.com/netblue30/firejail) | 2 | AC_INIT(firejail, 0.9.35, netblue30@yahoo.com, , http://github.com/netblue30/firejail) |
3 | AC_CONFIG_SRCDIR([src/firejail/main.c]) | 3 | AC_CONFIG_SRCDIR([src/firejail/main.c]) |
4 | #AC_CONFIG_HEADERS([config.h]) | 4 | #AC_CONFIG_HEADERS([config.h]) |
5 | 5 | ||
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); |