github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-27 15:57:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2149 from ManaSugi/fix-order-check-dir

Browse Source 
osbuilder: Fix the order of checking the distro config directory
This commit is contained in:
Fabiano Fidêncio 2021-07-11 18:28:32 +02:00 committed by GitHub
commit c8f32936d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/osbuilder/rootfs-builder/rootfs.sh
View File

@ -314,6 +314,8 @@ build_rootfs_distro()
[ -n "${distro}" ] || usage 1 [ -n "${distro}" ] || usage 1
distro_config_dir="${script_dir}/${distro}" distro_config_dir="${script_dir}/${distro}"
[ -d "${distro_config_dir}" ] || die "Not found configuration directory ${distro_config_dir}"
# Source config.sh from distro # Source config.sh from distro
rootfs_config="${distro_config_dir}/${CONFIG_SH}" rootfs_config="${distro_config_dir}/${CONFIG_SH}"
source "${rootfs_config}" source "${rootfs_config}"
@ -324,8 +326,6 @@ build_rootfs_distro()
source "${rootfs_arch_config}" source "${rootfs_arch_config}"
fi fi
[ -d "${distro_config_dir}" ] || die "Not found configuration directory ${distro_config_dir}"
if [ -z "$ROOTFS_DIR" ]; then if [ -z "$ROOTFS_DIR" ]; then
ROOTFS_DIR="${script_dir}/rootfs-${OS_NAME}" ROOTFS_DIR="${script_dir}/rootfs-${OS_NAME}"
fi fi