diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-24 15:17:59 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-24 16:24:13 -0400 |
| commit | 05128d533225b75f35f79a1f55b04556b7e9736b (patch) | |
| tree | a2e8d723e76fd8e44c81ea0fbe1ad4dda597856d /src/chroot-tools | |
| parent | d712e575c0d5b1bf66443beec3e7ed75be636e2d (diff) | |
Merge conf.sh:load_files and conf.sh:check_vars into load_conf
Diffstat (limited to 'src/chroot-tools')
| -rwxr-xr-x | src/chroot-tools/librechroot | 4 | ||||
| -rwxr-xr-x | src/chroot-tools/libremakepkg | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index 7b1c8c2..db4c87b 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -37,8 +37,6 @@ set -euE shopt -s nullglob umask 0022 -load_files chroot - ################################################################################ # Wrappers for files in ${pkglibexecdir}/chroot/ # ################################################################################ @@ -380,7 +378,7 @@ main() { return 0 fi - check_vars chroot CHROOTDIR CHROOT + load_conf chroot.conf CHROOTDIR CHROOT eval "$(calculate_directories)" readonly LIBREUSER LIBREHOME diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index 019bae1..02b31a8 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -212,8 +212,7 @@ main() { if $INCHROOT; then copydir='/' else - load_files chroot - check_vars chroot CHROOTDIR CHROOT + load_conf chroot.conf CHROOTDIR CHROOT || exit [[ -z ${chroot} ]] || CHROOT=$chroot if [[ ${copy:0:1} = / ]]; then copydir=$copy |