Mirrors/junest
1
0
Fork 0
mirror of https://github.com/fsquillace/junest.git synced 2026-07-25 11:53:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47 from fsquillace/issue_43

Browse source 
Issue 43
This commit is contained in:
Filippo Squillace 2015-01-08 20:03:30 +01:00
commit ebc9dcbd38
2 changed files with 29 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

48
lib/core.sh
View file

@ -73,6 +73,7 @@ PROOT_LINK=http://static.proot.me/proot-${ARCH}
SH="/bin/sh --login"
CHROOT=${JUJU_HOME}/usr/bin/arch-chroot
TRUE=${JUJU_HOME}/usr/bin/true
ID="${JUJU_HOME}/usr/bin/id -u"
################################# MAIN FUNCTIONS ##############################
@ -154,48 +155,47 @@ function _define_chroot_args(){
}
function _define_proot_args(){
local proot_args="$1"
shift
local comm=$(_define_chroot_args "$@")
echo "$proot_args" "${comm[@]}"
}
function run_juju_as_root(){
mkdir -p ${JUJU_HOME}/${HOME}
JUJU_ENV=1 ${CHROOT} $JUJU_HOME /usr/bin/bash -c "mkdir -p /run/lock && $(_define_chroot_args "$@")"
}
function _run_proot(){
if ! JUJU_ENV=1 ${@}
local proot_args="$1"
if ${PROOT_COMPAT} $proot_args ${TRUE} &> /dev/null
then
JUJU_ENV=1 ${PROOT_COMPAT} ${@}
elif PROOT_NO_SECCOMP=1 ${PROOT_COMPAT} $proot_args ${TRUE} &> /dev/null
then
warn "Proot error: Trying to execute proot with PROOT_NO_SECCOMP=1..."
JUJU_ENV=1 PROOT_NO_SECCOMP=1 ${@}
fi
}
function _run_juju_with_proot(){
[ "$(${ID} 2> /dev/null )" == "0" ] && \
die "You cannot access with root privileges. Use --root option instead."
if ! _run_proot ${PROOT_COMPAT} ${@}
then
JUJU_ENV=1 PROOT_NO_SECCOMP=1 ${PROOT_COMPAT} ${@}
else
die "Error: Check if the juju arguments are correct or use the option juju -p \"-k 3.10\""
fi
}
function _run_juju_with_proot(){
[ "$(_run_proot ${ID} 2> /dev/null )" == "0" ] && \
die "You cannot access with root privileges. Use --root option instead."
_run_proot "${@}"
}
function run_juju_as_fakeroot(){
local comm=$(_define_proot_args "$@")
_run_juju_with_proot "-S" ${JUJU_HOME} ${comm}
local proot_args="$1"
shift
local comm=$(_define_chroot_args "$@")
_run_juju_with_proot "-S ${JUJU_HOME} ${proot_args}" ${comm}
}
function run_juju_as_user(){
local comm=$(_define_proot_args "$@")
_run_juju_with_proot "-R" ${JUJU_HOME} ${comm}
local proot_args="$1"
shift
local comm=$(_define_chroot_args "$@")
_run_juju_with_proot "-R ${JUJU_HOME} $proot_args" ${comm}
}

7
tests/test_core.sh
View file

@ -174,13 +174,16 @@ function test_run_juju_with_proot_as_root(){
}
function test_run_proot_seccomp(){
local output=$(_run_proot "env" | grep "^PROOT_NO_SECCOMP")
TRUE=""
PROOT_COMPAT=env
local output=$(_run_proot | grep "^PROOT_NO_SECCOMP")
is_equal $output "" || return 1
envv(){
env | grep "^PROOT_NO_SECCOMP"
}
local output=$(_run_proot "envv" 2> /dev/null | grep "^PROOT_NO_SECCOMP")
PROOT_COMPAT=envv
local output=$(_run_proot 2> /dev/null | grep "^PROOT_NO_SECCOMP")
is_equal $output "PROOT_NO_SECCOMP=1" || return 1
}