From 5b28e3905a24f17fbbaedbe692f19c4bd9b57b5e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 26 Apr 2009 12:06:09 -0400 Subject: setup local sandbox.d for running tests to avoid /etc/sandbox.d Always use local sandbox.d copy to avoid random /etc/sandbox.d issues like it doesn't exist, or has permission problems, or anything else. Signed-off-by: Mike Frysinger --- etc/00default | 20 -------------------- etc/Makefile.am | 6 ++---- etc/sandbox.d/00default | 20 ++++++++++++++++++++ etc/sandbox.d/Makefile.am | 2 ++ 4 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 etc/00default create mode 100644 etc/sandbox.d/00default create mode 100644 etc/sandbox.d/Makefile.am (limited to 'etc') diff --git a/etc/00default b/etc/00default deleted file mode 100644 index a419480..0000000 --- a/etc/00default +++ /dev/null @@ -1,20 +0,0 @@ -# Default configuration for non-set values -# -# As stated in sandbox.conf, any value in here do not get used if the variable -# is already present in the environment. All rules of the ACCESS Section -# applies here. -# -# Also note that SANDBOX_WORKDIR is a special variable that is just set if -# sandbox is run interactive (ie, no commandline options), and points to the -# current directory. - -# Normally the whole filesystem should be readable -SANDBOX_READ="/" - -# Finally add current directory if interactive -SANDBOX_WRITE="${SANDBOX_WORKDIR}" -# Needed for configure tests -SANDBOX_WRITE="/usr/tmp/conftest:/usr/lib/conftest:/usr/lib32/conftest:/usr/lib64/conftest:/usr/tmp/cf:/usr/lib/cf:/usr/lib32/cf:/usr/lib64/cf" - -# Usually writes in /home should not cause violations -SANDBOX_PREDICT="${HOME}" diff --git a/etc/Makefile.am b/etc/Makefile.am index 3425f1b..1640a57 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -1,6 +1,4 @@ +SUBDIRS = sandbox.d + confdir = $(sysconfdir) dist_conf_DATA = sandbox.conf - -confddir = $(sysconfdir)/sandbox.d -dist_confd_DATA = 00default - diff --git a/etc/sandbox.d/00default b/etc/sandbox.d/00default new file mode 100644 index 0000000..a419480 --- /dev/null +++ b/etc/sandbox.d/00default @@ -0,0 +1,20 @@ +# Default configuration for non-set values +# +# As stated in sandbox.conf, any value in here do not get used if the variable +# is already present in the environment. All rules of the ACCESS Section +# applies here. +# +# Also note that SANDBOX_WORKDIR is a special variable that is just set if +# sandbox is run interactive (ie, no commandline options), and points to the +# current directory. + +# Normally the whole filesystem should be readable +SANDBOX_READ="/" + +# Finally add current directory if interactive +SANDBOX_WRITE="${SANDBOX_WORKDIR}" +# Needed for configure tests +SANDBOX_WRITE="/usr/tmp/conftest:/usr/lib/conftest:/usr/lib32/conftest:/usr/lib64/conftest:/usr/tmp/cf:/usr/lib/cf:/usr/lib32/cf:/usr/lib64/cf" + +# Usually writes in /home should not cause violations +SANDBOX_PREDICT="${HOME}" diff --git a/etc/sandbox.d/Makefile.am b/etc/sandbox.d/Makefile.am new file mode 100644 index 0000000..b8195ff --- /dev/null +++ b/etc/sandbox.d/Makefile.am @@ -0,0 +1,2 @@ +confddir = $(sysconfdir)/sandbox.d +dist_confd_DATA = 00default -- cgit v1.2.3-65-gdbad