summaryrefslogtreecommitdiff
path: root/src/chroot-tools/librechroot
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2017-07-29 21:59:30 -0400
committerDavid P <megver83@parabola.nu>2017-07-29 21:59:30 -0400
commit5e9742f03e4199c006b0f9d0d8069a2fb41d9258 (patch)
treec5e7c30625b30b50a2a2385ef934c1d7e57eb2fa /src/chroot-tools/librechroot
parent63f4ac3c0a6ea7e060720b63964cf158157fc785 (diff)
parent0b8606e0cd0e1aedfe222d4d6603c4986aacb7b5 (diff)
Merge branch 'master' of ssh://git.parabola.nu:1863/~git/packages/libretoolsHEADmaster
Diffstat (limited to 'src/chroot-tools/librechroot')
-rwxr-xr-xsrc/chroot-tools/librechroot6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot
index 01353a4..ff764b6 100755
--- a/src/chroot-tools/librechroot
+++ b/src/chroot-tools/librechroot
@@ -291,6 +291,9 @@ main() {
COPY=$LIBREUSER
[[ $COPY != root ]] || COPY=copy
+ declare -i retconf=0
+ load_conf chroot.conf CHROOTDIR CHROOT || retconf=$?
+
local mode=enter
while getopts 'n:l:NC:M:A:w:r:' opt; do
case $opt in
@@ -372,13 +375,12 @@ main() {
:;;
esac
-
if [[ $mode == help ]]; then
usage
return $EXIT_SUCCESS
fi
- load_conf chroot.conf CHROOTDIR CHROOT
+ [[ $retconf = 0 ]] || exit $retconf
eval "$(calculate_directories)"
readonly LIBREUSER LIBREHOME