aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-06-04 20:59:45 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-06-04 20:59:45 +0000
commitf0248cf27a85059adf2ecba5b0a28e2379a409d6 (patch)
treec8af06647cafbd1a0c12c6d6b12d0a5fd8792cdd
parent262b9d3a290353bab9bbab3ad252aeeca74130ce (diff)
downloadpaludis-f0248cf27a85059adf2ecba5b0a28e2379a409d6.tar.gz
paludis-f0248cf27a85059adf2ecba5b0a28e2379a409d6.tar.xz
r3224@snowflake: ciaranm | 2007-06-04 21:58:29 +0100
Fix sandbox issues
-rw-r--r--paludis/eapis/0.conf2
-rw-r--r--paludis/eapis/exheres-0.conf2
-rw-r--r--paludis/eapis/paludis-1.conf2
-rwxr-xr-xpaludis/repositories/gentoo/ebuild/ebuild.bash1
4 files changed, 3 insertions, 4 deletions
diff --git a/paludis/eapis/0.conf b/paludis/eapis/0.conf
index 6547a68..d92c2e7 100644
--- a/paludis/eapis/0.conf
+++ b/paludis/eapis/0.conf
@@ -15,7 +15,7 @@ require_use_expand_in_iuse = false
ebuild_install = \
: prepare ; \
- userpriv : init saveenv ; \
+ userpriv sandbox : init saveenv ; \
: loadenv setup saveenv ; \
sandbox userpriv : loadenv unpack compile test saveenv ; \
sandbox : loadenv install saveenv ; \
diff --git a/paludis/eapis/exheres-0.conf b/paludis/eapis/exheres-0.conf
index dc83b26..eb95b36 100644
--- a/paludis/eapis/exheres-0.conf
+++ b/paludis/eapis/exheres-0.conf
@@ -14,7 +14,7 @@ require_use_expand_in_iuse = true
ebuild_install = \
: prepare ; \
- userpriv : init saveenv ; \
+ userpriv sandbox : init saveenv ; \
sandbox : loadenv setup saveenv ; \
sandbox userpriv : loadenv unpack compile test saveenv ; \
sandbox : loadenv install saveenv ; \
diff --git a/paludis/eapis/paludis-1.conf b/paludis/eapis/paludis-1.conf
index 0e1237f..299a7e3 100644
--- a/paludis/eapis/paludis-1.conf
+++ b/paludis/eapis/paludis-1.conf
@@ -15,7 +15,7 @@ require_use_expand_in_iuse = false
ebuild_install = \
: prepare ; \
- userpriv : init saveenv ; \
+ userpriv sandbox : init saveenv ; \
sandbox : loadenv setup saveenv ; \
sandbox userpriv : loadenv unpack compile test saveenv ; \
sandbox : loadenv install saveenv ; \
diff --git a/paludis/repositories/gentoo/ebuild/ebuild.bash b/paludis/repositories/gentoo/ebuild/ebuild.bash
index c8a7fef..d63e903 100755
--- a/paludis/repositories/gentoo/ebuild/ebuild.bash
+++ b/paludis/repositories/gentoo/ebuild/ebuild.bash
@@ -32,7 +32,6 @@ if [[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] ; then
export SANDBOX_WRITE="${SANDBOX_WRITE}/dev/shm:/dev/stdout:/dev/stderr:/dev/null:/dev/tty:/dev/pts"
export SANDBOX_WRITE="${SANDBOX_WRITE}:${PALUDIS_TMPDIR}:/var/cache"
export SANDBOX_WRITE="${SANDBOX_WRITE}:/proc/self/attr:/proc/self/task:/selinux/context"
- export SANDBOX_WRITE="${SANDBOX_WRITE}:/tmp"
[[ -n "${CCACHE_DIR}" ]] && export SANDBOX_WRITE="${SANDBOX_WRITE}:${CCACHE_DIR}"
export SANDBOX_ON="1"
export SANDBOX_BASHRC="/dev/null"