mirror of
https://github.com/fsquillace/junest.git
synced 2026-08-03 00:02:22 +00:00
POC for fakechroot
This commit is contained in:
Filippo Squillace
parent
46221f26b1
commit
db2f62ba8f
3 changed files with 74 additions and 93 deletions
|
|
@ -26,7 +26,7 @@ usage() {
|
|||
echo -e "Access options:"
|
||||
echo -e "-f, --fakeroot Run $NAME with fakeroot privileges"
|
||||
echo -e "-r, --root Run $NAME with root privileges"
|
||||
echo -e "-p, --proot-args <args> Proot arguments (use '$CMD -p \"--help\"' to check out the proot options)"
|
||||
echo -e "-p, --proot-args <args> Proot arguments (use $CMD -p \"--help\" to check out the proot options)"
|
||||
echo
|
||||
echo -e "Building options:"
|
||||
echo -e "-b, --build-image Build a $NAME image (must run in ArchLinux)"
|
||||
|
|
@ -202,11 +202,11 @@ function execute_operation(){
|
|||
die "The option --arch cannot be specified since JuNest has already been downloaded in $JUNEST_HOME"
|
||||
|
||||
if $OPT_FAKEROOT; then
|
||||
run_env_as_fakeroot "${PROOT_ARGS}" "${ARGS[@]}"
|
||||
run_env_as_fakeroot "${ARGS[@]}"
|
||||
elif $OPT_ROOT; then
|
||||
run_env_as_root "${ARGS[@]}"
|
||||
else
|
||||
run_env_as_user "${PROOT_ARGS}" "${ARGS[@]}"
|
||||
run_env_as_user "${ARGS[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
|||
25
etc/fakechroot/chroot.env
Normal file
25
etc/fakechroot/chroot.env
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
# Additional environment setting for chroot
|
||||
|
||||
# Add /usr/sbin and /sbin to PATH if chroot command can't be found
|
||||
if ! command -v chroot >/dev/null; then
|
||||
PATH="${PATH:-/usr/bin:/bin}:/usr/sbin:/sbin"
|
||||
export PATH
|
||||
fi
|
||||
|
||||
# Set a list of command substitutions based on PATH variable
|
||||
fakechroot_chroot_env_cmd_subst=""
|
||||
for fakechroot_chroot_env_d in `echo $PATH | tr ':' ' '`; do
|
||||
fakechroot_chroot_env_cmd_subst="$fakechroot_chroot_env_cmd_subst
|
||||
$fakechroot_chroot_env_d/chroot=${fakechroot_bindir:-$JUNEST_HOME/usr/bin}/chroot.fakechroot
|
||||
$fakechroot_chroot_env_d/env=${fakechroot_bindir:-$JUNEST_HOME/usr/bin}/env.fakechroot
|
||||
$fakechroot_chroot_env_d/ischroot=/bin/true
|
||||
$fakechroot_chroot_env_d/ldconfig=/bin/true
|
||||
$fakechroot_chroot_env_d/ldd=${fakechroot_bindir:-$JUNEST_HOME/usr/bin}/ldd.fakechroot"
|
||||
done
|
||||
|
||||
FAKECHROOT_CMD_SUBST="${FAKECHROOT_CMD_SUBST:+$FAKECHROOT_CMD_SUBST:}`echo \"$fakechroot_chroot_env_cmd_subst\" | tr '\012' ':'`"
|
||||
export FAKECHROOT_CMD_SUBST
|
||||
|
||||
# Set the default list of directories excluded from being chrooted
|
||||
FAKECHROOT_EXCLUDE_PATH="${FAKECHROOT_EXCLUDE_PATH:-/dev:/proc:/sys:/tmp:$HOME}"
|
||||
export FAKECHROOT_EXCLUDE_PATH
|
||||
136
lib/core.sh
136
lib/core.sh
|
|
@ -58,7 +58,7 @@ then
|
|||
ARCH="arm"
|
||||
LD_LIB="${JUNEST_HOME}/lib/ld-linux-armhf.so.3"
|
||||
else
|
||||
die "Unknown architecture ${ARCH}"
|
||||
die "Unknown architecture ${HOST_ARCH}"
|
||||
fi
|
||||
|
||||
MAIN_REPO=https://dl.dropboxusercontent.com/u/42449030
|
||||
|
|
@ -76,6 +76,10 @@ ORIGIN_WD=$(pwd)
|
|||
SH=("/bin/sh" "--login")
|
||||
|
||||
# List of executables that are run in the host OS:
|
||||
FAKECHROOT="${JUNEST_HOME}/usr/bin/fakechroot \
|
||||
-l ${JUNEST_HOME}/usr/lib/libfakeroot/fakechroot/libfakechroot.so \
|
||||
-c ${JUNEST_BASE}/etc/fakechroot/ \
|
||||
-b ${JUNEST_HOME}/usr/bin"
|
||||
PROOT="${JUNEST_HOME}/opt/proot/proot-${ARCH}"
|
||||
CHROOT=${JUNEST_BASE}/bin/jchroot
|
||||
CLASSIC_CHROOT="chroot"
|
||||
|
|
@ -119,20 +123,6 @@ function mkdir_cmd(){
|
|||
$MKDIR $@ || $LD_EXEC ${JUNEST_HOME}/usr/bin/$MKDIR $@
|
||||
}
|
||||
|
||||
function proot_cmd(){
|
||||
local proot_args="$1"
|
||||
shift
|
||||
if ${PROOT} ${proot_args} "${SH[@]}" "-c" ":"
|
||||
then
|
||||
${PROOT} ${proot_args} "${@}"
|
||||
elif PROOT_NO_SECCOMP=1 ${PROOT} ${proot_args} "${SH[@]}" "-c" ":"
|
||||
then
|
||||
PROOT_NO_SECCOMP=1 ${PROOT} ${proot_args} "${@}"
|
||||
else
|
||||
die "Error: Check if the ${CMD} arguments are correct and if the kernel is too old use the option ${CMD} -p \"-k 3.10\""
|
||||
fi
|
||||
}
|
||||
|
||||
function download_cmd(){
|
||||
$WGET $@ || $CURL $@
|
||||
}
|
||||
|
|
@ -293,38 +283,6 @@ function run_env_as_root(){
|
|||
JUNEST_ENV=1 chroot_cmd "$JUNEST_HOME" "${SH[@]}" "-c" "${main_cmd}"
|
||||
}
|
||||
|
||||
function _run_env_with_proot(){
|
||||
local proot_args="$1"
|
||||
shift
|
||||
|
||||
if [ "$1" != "" ]
|
||||
then
|
||||
JUNEST_ENV=1 proot_cmd "${proot_args}" "${SH[@]}" "-c" "$(insert_quotes_on_spaces "${@}")"
|
||||
else
|
||||
JUNEST_ENV=1 proot_cmd "${proot_args}" "${SH[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
function _run_env_with_qemu(){
|
||||
local proot_args="$1"
|
||||
source ${JUNEST_HOME}/etc/junest/info
|
||||
|
||||
if [ "$JUNEST_ARCH" != "$ARCH" ]
|
||||
then
|
||||
local qemu_bin="qemu-$JUNEST_ARCH-static-$ARCH"
|
||||
local qemu_symlink="/tmp/${qemu_bin}-$RANDOM"
|
||||
trap - QUIT EXIT ABRT KILL TERM INT
|
||||
trap "[ -e ${qemu_symlink} ] && rm_cmd -f ${qemu_symlink}" EXIT QUIT ABRT KILL TERM INT
|
||||
|
||||
warn "Emulating $NAME via QEMU..."
|
||||
[ -e ${qemu_symlink} ] || \
|
||||
ln_cmd -s ${JUNEST_HOME}/opt/qemu/${qemu_bin} ${qemu_symlink}
|
||||
proot_args="-q ${qemu_symlink} $proot_args"
|
||||
fi
|
||||
shift
|
||||
_run_env_with_proot "$proot_args" "${@}"
|
||||
}
|
||||
|
||||
#######################################
|
||||
# Run JuNest as fakeroot.
|
||||
#
|
||||
|
|
@ -344,7 +302,16 @@ function run_env_as_fakeroot(){
|
|||
(( EUID == 0 )) && \
|
||||
die_on_status $ROOT_ACCESS_ERROR "You cannot access with root privileges. Use --root option instead."
|
||||
|
||||
_run_env_with_qemu "-S ${JUNEST_HOME} $1" "${@:2}"
|
||||
_copy_files /etc/host.conf
|
||||
_copy_files /etc/hosts
|
||||
_copy_files /etc/nsswitch.conf
|
||||
|
||||
if [ "$1" != "" ]
|
||||
then
|
||||
JUNEST_ENV=1 $FAKECHROOT chroot "$JUNEST_HOME" fakeroot "${SH[@]}" "-c" "$(insert_quotes_on_spaces "${@}")"
|
||||
else
|
||||
JUNEST_ENV=1 $FAKECHROOT chroot "$JUNEST_HOME" fakeroot "${SH[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
#######################################
|
||||
|
|
@ -366,41 +333,22 @@ function run_env_as_user(){
|
|||
(( EUID == 0 )) && \
|
||||
die_on_status $ROOT_ACCESS_ERROR "You cannot access with root privileges. Use --root option instead."
|
||||
|
||||
_build_passwd_and_group
|
||||
_provide_bindings_as_user
|
||||
local bindings="$RESULT"
|
||||
unset RESULT
|
||||
_run_env_with_qemu "$bindings -r ${JUNEST_HOME} $1" "${@:2}"
|
||||
}
|
||||
_copy_files /etc/host.conf
|
||||
_copy_files /etc/hosts
|
||||
_copy_files /etc/hosts.equiv
|
||||
_copy_files /etc/netgroup
|
||||
_copy_files /etc/networks
|
||||
_copy_files /etc/nsswitch.conf
|
||||
_copy_files /etc/resolv.conf
|
||||
#_copy_files /etc/localtime
|
||||
_copy_passwd_and_group
|
||||
|
||||
#######################################
|
||||
# Provide the proot binding options for the normal user.
|
||||
# The list of bindings can be found in `proot --help`. This function excludes
|
||||
# /etc/mtab file so that it will not give conflicts with the related
|
||||
# symlink in the image.
|
||||
#
|
||||
# Globals:
|
||||
# HOME (RO) : The home directory.
|
||||
# RESULT (WO) : Contains the binding options.
|
||||
# Arguments:
|
||||
# None
|
||||
# Returns:
|
||||
# None
|
||||
# Output:
|
||||
# None
|
||||
#######################################
|
||||
function _provide_bindings_as_user(){
|
||||
RESULT=""
|
||||
local re='(.*):.*'
|
||||
for bind in "/etc/host.conf" "/etc/hosts" "/etc/hosts.equiv" "/etc/netgroup" "/etc/networks" "${JUNEST_HOME}/etc/junest/passwd:/etc/passwd" "${JUNEST_HOME}/etc/junest/group:/etc/group" "/etc/nsswitch.conf" "/etc/resolv.conf" "/etc/localtime" "/dev" "/sys" "/proc" "/tmp" "$HOME"
|
||||
do
|
||||
if [[ $bind =~ $re ]]
|
||||
then
|
||||
[ -e "${BASH_REMATCH[1]}" ] && RESULT="-b $bind $RESULT"
|
||||
else
|
||||
[ -e "$bind" ] && RESULT="-b $bind $RESULT"
|
||||
fi
|
||||
done
|
||||
if [ "$1" != "" ]
|
||||
then
|
||||
JUNEST_ENV=1 $FAKECHROOT chroot "$JUNEST_HOME" "${SH[@]}" "-c" "$(insert_quotes_on_spaces "${@}")"
|
||||
else
|
||||
JUNEST_ENV=1 $FAKECHROOT chroot "$JUNEST_HOME" "${SH[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
#######################################
|
||||
|
|
@ -419,25 +367,30 @@ function _provide_bindings_as_user(){
|
|||
# Output:
|
||||
# None
|
||||
#######################################
|
||||
function _build_passwd_and_group(){
|
||||
function _copy_passwd_and_group(){
|
||||
# Enumeration of users/groups is disabled/limited depending on how nsswitch.conf
|
||||
# is configured.
|
||||
# Try to at least get the current user via `getent passwd $USER` since it uses
|
||||
# a more reliable and faster system call (getpwnam(3)).
|
||||
if ! getent_cmd passwd > ${JUNEST_HOME}/etc/junest/passwd || \
|
||||
! getent_cmd passwd ${USER} >> ${JUNEST_HOME}/etc/junest/passwd
|
||||
if ! getent_cmd passwd > ${JUNEST_HOME}/etc/passwd || \
|
||||
! getent_cmd passwd ${USER} >> ${JUNEST_HOME}/etc/passwd
|
||||
then
|
||||
warn "getent command failed or does not exist. Binding directly from /etc/passwd."
|
||||
cp_cmd /etc/passwd ${JUNEST_HOME}/etc/junest/passwd
|
||||
cp_cmd /etc/passwd ${JUNEST_HOME}/etc/passwd
|
||||
fi
|
||||
|
||||
if ! getent_cmd group > ${JUNEST_HOME}/etc/junest/group
|
||||
if ! getent_cmd group > ${JUNEST_HOME}/etc/group
|
||||
then
|
||||
warn "getent command failed or does not exist. Binding directly from /etc/group."
|
||||
cp_cmd /etc/group ${JUNEST_HOME}/etc/junest/group
|
||||
cp_cmd /etc/group ${JUNEST_HOME}/etc/group
|
||||
fi
|
||||
}
|
||||
|
||||
function _copy_files() {
|
||||
[[ -r ${1} ]] && cp_cmd "${1}" ${JUNEST_HOME}/${1}
|
||||
return 0
|
||||
}
|
||||
|
||||
#######################################
|
||||
# Remove an existing JuNest system.
|
||||
#
|
||||
|
|
@ -502,6 +455,8 @@ function build_image_env(){
|
|||
_check_package gcc
|
||||
_check_package package-query
|
||||
_check_package git
|
||||
_check_package fakeroot
|
||||
_check_package fakechroot
|
||||
|
||||
local disable_validation=$1
|
||||
local skip_root_tests=$2
|
||||
|
|
@ -514,7 +469,8 @@ function build_image_env(){
|
|||
# The archlinux-keyring and libunistring are due to missing dependencies declaration in ARM archlinux
|
||||
# All the essential executables (ln, mkdir, chown, etc) are in coreutils
|
||||
# yaourt requires sed
|
||||
sudo pacstrap -G -M -d ${maindir}/root pacman coreutils libunistring archlinux-keyring sed
|
||||
# localedef (called by locale-gen) requires gzip
|
||||
sudo pacstrap -G -M -d ${maindir}/root pacman coreutils libunistring archlinux-keyring sed gzip fakeroot fakechroot
|
||||
sudo bash -c "echo 'Server = $DEFAULT_MIRROR' >> ${maindir}/root/etc/pacman.d/mirrorlist"
|
||||
sudo mkdir -p ${maindir}/root/run/lock
|
||||
|
||||
|
|
@ -533,7 +489,7 @@ function build_image_env(){
|
|||
sudo ln -sf /usr/share/zoneinfo/posix/UTC ${maindir}/root/etc/localtime
|
||||
sudo bash -c "echo 'en_US.UTF-8 UTF-8' >> ${maindir}/root/etc/locale.gen"
|
||||
sudo ${maindir}/root/opt/junest/bin/jchroot ${maindir}/root locale-gen
|
||||
sudo bash -c "echo 'LANG=\"en_US.UTF-8\"' >> ${maindir}/root/etc/locale.conf"
|
||||
sudo bash -c "echo LANG=\"en_US.UTF-8\" >> ${maindir}/root/etc/locale.conf"
|
||||
|
||||
info "Setting up the pacman keyring (this might take a while!)..."
|
||||
sudo ${maindir}/root/opt/junest/bin/jchroot ${maindir}/root bash -c \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue