From 05128d533225b75f35f79a1f55b04556b7e9736b Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Wed, 24 May 2017 15:17:59 -0400
Subject: Merge conf.sh:load_files and conf.sh:check_vars into load_conf

---
 src/chroot-tools/librechroot | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/chroot-tools/librechroot')

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
-- 
cgit v1.2.3-54-g00ecf