Mirrors/junest
1
0
Fork 0
mirror of https://github.com/fsquillace/junest.git synced 2026-01-23 02:34:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev'

Browse source
This commit is contained in:
Filippo Squillace 2019-12-01 17:11:10 +01:00
commit 4bb9b60638
4 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
7.0.1
7.0.2

8
bin/junest
View file

@ -40,23 +40,23 @@ usage() {
echo
echo -e " n[s] Access via Linux Namespaces using GRoot (Default action)"
echo -e " -b, --backend-args <args> Arguments for GRoot backend program"
echo -e " ($CMD groot -p \"--help\" to check out the GRoot options)"
echo -e " ($CMD groot -b \"--help\" to check out the GRoot options)"
echo -e " -n, --no-copy-files Do not copy common etc files into $NAME environment"
echo
echo -e " p[root] Access via PRoot"
echo -e " -f, --fakeroot Run $NAME with fakeroot privileges"
echo -e " -b, --backend-args <args> Arguments for PRoot backend program"
echo -e " ($CMD proot -p \"--help\" to check out the PRoot options)"
echo -e " ($CMD proot -b \"--help\" to check out the PRoot options)"
echo -e " -n, --no-copy-files Do not copy common etc files into $NAME environment"
echo
echo -e " g[root] Access with root privileges via GRoot"
echo -e " -b, --backend-args <args> Arguments for GRoot backend program"
echo -e " ($CMD groot -p \"--help\" to check out the GRoot options)"
echo -e " ($CMD groot -b \"--help\" to check out the GRoot options)"
echo -e " -n, --no-copy-files Do not copy common etc files into $NAME environment"
echo
echo -e " r[oot] Access with root privileges via classic chroot"
echo -e " -b, --backend-args <args> Arguments for chroot backend program"
echo -e " ($CMD root -p \"--help\" to check out the chroot options)"
echo -e " ($CMD root -b \"--help\" to check out the chroot options)"
echo -e " -n, --no-copy-files Do not copy common etc files into $NAME environment"
echo
echo -e " b[uild] Build a $NAME image (must run in ArchLinux)"

6
lib/checks/check.sh
View file

@ -69,16 +69,14 @@ pacman --noconfirm -Rsn ${repo_package2}
if ! $SKIP_AUR_TESTS
then
aur_package=aurutils
aur_package=tcptraceroute
info "Checking ${aur_package} package from AUR repo..."
maindir=$(mktemp -d -t ${CMD}.XXXXXXXXXX)
builtin cd ${maindir}
curl -L -J -O -k "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=${aur_package}"
curl -L -J -O -k "https://aur.archlinux.org/cgit/aur.git/plain/${aur_package}.install?h=${aur_package}"
/opt/makepkg/bin/makepkg -sfcd
/opt/makepkg/bin/makepkg -sfc --noconfirm
pacman --noconfirm -U ${aur_package}*.pkg.tar.xz
aur search aur 1> /dev/null
pacman --noconfirm -Rsn ${aur_package}
fi

2
lib/core/common.sh
View file

@ -152,7 +152,7 @@ function proot_cmd(){
elif PROOT_NO_SECCOMP=1 ${PROOT} ${proot_args} "${SH[@]}" "-c" ":"
then
warn "Warn: Proot is not properly working. Disabling SECCOMP and expect the application to run slowly in particular when it uses syscalls intensively."
warn "Try to use Linux namespace instead as it is more reliable: junest -u"
warn "Try to use Linux namespace instead as it is more reliable: junest ns"
PROOT_NO_SECCOMP=1 ${PROOT} ${proot_args} "${@}"
else
die "Error: Something went wrong with proot command. Exiting"