From 88e7075929fc5d13ffb89328b4205e0182c81490 Mon Sep 17 00:00:00 2001 From: Manabu Sugimoto Date: Wed, 30 Jun 2021 00:48:51 +0900 Subject: [PATCH] osbuilder: Fix the order of checking the distro config directory Check if the distro config directory exists before using the directory Fixes: #2148 Signed-off-by: Manabu Sugimoto --- tools/osbuilder/rootfs-builder/rootfs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/osbuilder/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh index 961f3c70c..a53138168 100755 --- a/tools/osbuilder/rootfs-builder/rootfs.sh +++ b/tools/osbuilder/rootfs-builder/rootfs.sh @@ -314,6 +314,8 @@ build_rootfs_distro() [ -n "${distro}" ] || usage 1 distro_config_dir="${script_dir}/${distro}" + [ -d "${distro_config_dir}" ] || die "Not found configuration directory ${distro_config_dir}" + # Source config.sh from distro rootfs_config="${distro_config_dir}/${CONFIG_SH}" source "${rootfs_config}" @@ -324,8 +326,6 @@ build_rootfs_distro() source "${rootfs_arch_config}" fi - [ -d "${distro_config_dir}" ] || die "Not found configuration directory ${distro_config_dir}" - if [ -z "$ROOTFS_DIR" ]; then ROOTFS_DIR="${script_dir}/rootfs-${OS_NAME}" fi