From fa56cd63c8d273a4039a1c62684715cf3e23b1ad Mon Sep 17 00:00:00 2001 From: netblue30 Date: Sun, 8 Nov 2015 12:20:28 -0500 Subject: move firejail directory form /tmp to /run --- configure | 18 +++++++++--------- configure.ac | 2 +- src/firejail/firejail.h | 50 ++++++++++++++++++++++++------------------------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/configure b/configure index 2d2779f91..3e3676f40 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for firejail 0.9.34. +# Generated by GNU Autoconf 2.69 for firejail 0.9.35. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='firejail' PACKAGE_TARNAME='firejail' -PACKAGE_VERSION='0.9.34' -PACKAGE_STRING='firejail 0.9.34' +PACKAGE_VERSION='0.9.35' +PACKAGE_STRING='firejail 0.9.35' PACKAGE_BUGREPORT='netblue30@yahoo.com' PACKAGE_URL='http://github.com/netblue30/firejail' @@ -1238,7 +1238,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures firejail 0.9.34 to adapt to many kinds of systems. +\`configure' configures firejail 0.9.35 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1299,7 +1299,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of firejail 0.9.34:";; + short | recursive ) echo "Configuration of firejail 0.9.35:";; esac cat <<\_ACEOF @@ -1389,7 +1389,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -firejail configure 0.9.34 +firejail configure 0.9.35 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1691,7 +1691,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by firejail $as_me 0.9.34, which was +It was created by firejail $as_me 0.9.35, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4102,7 +4102,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by firejail $as_me 0.9.34, which was +This file was extended by firejail $as_me 0.9.35, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4156,7 +4156,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -firejail config.status 0.9.34 +firejail config.status 0.9.35 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 29fbf931f..589451cab 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.68]) -AC_INIT(firejail, 0.9.34, netblue30@yahoo.com, , http://github.com/netblue30/firejail) +AC_INIT(firejail, 0.9.35, netblue30@yahoo.com, , http://github.com/netblue30/firejail) AC_CONFIG_SRCDIR([src/firejail/main.c]) #AC_CONFIG_HEADERS([config.h]) 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 @@ #include "../include/common.h" // filesystem -#define FIREJAIL_DIR "/tmp/firejail" -#define NETWORK_LOCK_FILE "/tmp/firejail/firejail.lock" -#define RO_DIR "/tmp/firejail/firejail.ro.dir" -#define RO_FILE "/tmp/firejail/firejail.ro.file" -#define MNT_DIR "/tmp/firejail/mnt" // a tmpfs is mounted on this directory before any of the files below are created -#define SECCOMP_CFG "/tmp/firejail/mnt/seccomp" -#define CGROUP_CFG "/tmp/firejail/mnt/cgroup" -#define CPU_CFG "/tmp/firejail/mnt/cpu" -#define GROUPS_CFG "/tmp/firejail/mnt/groups" -#define PROTOCOL_CFG "/tmp/firejail/mnt/protocol" -#define CP_COMMAND "/tmp/firejail/mnt/cp" -#define HOME_DIR "/tmp/firejail/mnt/home" -#define ETC_DIR "/tmp/firejail/mnt/etc" -#define BIN_DIR "/tmp/firejail/mnt/bin" -#define DRI_DIR "/tmp/firejail/mnt/dri" -#define PULSE_DIR "/tmp/firejail/mnt/pulse" -#define WHITELIST_HOME_DIR "/tmp/firejail/mnt/whome" -#define XAUTHORITY_FILE "/tmp/firejail/mnt/.Xauthority" -#define HOSTNAME_FILE "/tmp/firejail/mnt/hostname" -#define RESOLVCONF_FILE "/tmp/firejail/mnt/resolv.conf" -#define LDPRELOAD_FILE "/tmp/firejail/mnt/ld.so.preload" -#define UTMP_FILE "/tmp/firejail/mnt/utmp" +#define FIREJAIL_DIR "/run/firejail" +#define NETWORK_LOCK_FILE "/run/firejail/firejail.lock" +#define RO_DIR "/run/firejail/firejail.ro.dir" +#define RO_FILE "/run/firejail/firejail.ro.file" +#define MNT_DIR "/run/firejail/mnt" // a tmpfs is mounted on this directory before any of the files below are created +#define SECCOMP_CFG "/run/firejail/mnt/seccomp" +#define CGROUP_CFG "/run/firejail/mnt/cgroup" +#define CPU_CFG "/run/firejail/mnt/cpu" +#define GROUPS_CFG "/run/firejail/mnt/groups" +#define PROTOCOL_CFG "/run/firejail/mnt/protocol" +#define CP_COMMAND "/run/firejail/mnt/cp" +#define HOME_DIR "/run/firejail/mnt/home" +#define ETC_DIR "/run/firejail/mnt/etc" +#define BIN_DIR "/run/firejail/mnt/bin" +#define DRI_DIR "/run/firejail/mnt/dri" +#define PULSE_DIR "/run/firejail/mnt/pulse" +#define WHITELIST_HOME_DIR "/run/firejail/mnt/whome" +#define XAUTHORITY_FILE "/run/firejail/mnt/.Xauthority" +#define HOSTNAME_FILE "/run/firejail/mnt/hostname" +#define RESOLVCONF_FILE "/run/firejail/mnt/resolv.conf" +#define LDPRELOAD_FILE "/run/firejail/mnt/ld.so.preload" +#define UTMP_FILE "/run/firejail/mnt/utmp" // profiles #define DEFAULT_USER_PROFILE "generic" @@ -163,7 +163,7 @@ static inline int any_interface_configured(void) { return 0; } -extern int arg_private; // mount private /home and /tmp directory +extern int arg_private; // mount private /home extern int arg_debug; // print debug messages extern int arg_nonetwork; // --net=none extern int arg_command; // -c @@ -233,9 +233,9 @@ int net_config_mac(const char *ifname, const unsigned char mac[6]); int net_get_mac(const char *ifname, unsigned char mac[6]); // fs.c -// build /tmp/firejail directory +// build /run/firejail directory void fs_build_firejail_dir(void); -// build /tmp/firejail/mnt directory +// build /run/firejail/mnt directory void fs_build_mnt_dir(void); // grab a copy of cp command void fs_build_cp_command(void); -- cgit v1.2.3-70-g09d2