From 2542e6804ec41857e386a3528362eaf354b3aead Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 20 Apr 2018 08:30:57 -0700 Subject: [PATCH] cube-ctl: fix regression with c3 add and btrfs subvol creation The commit e9e8c92d3a3ce0f46eee870d20d4c876494d303c (cube-ctl: Optimize "c3 add" instantiation time) caused the btrfs sub volume code to stop working because it was checking for the existence of the wrong directory. It should have checked out_dir=/opt/container + the container name. Signed-off-by: Jason Wessel --- meta-cube/recipes-support/overc-utils/source/cube-ctl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-cube/recipes-support/overc-utils/source/cube-ctl b/meta-cube/recipes-support/overc-utils/source/cube-ctl index 75f2cbe..a8b2039 100755 --- a/meta-cube/recipes-support/overc-utils/source/cube-ctl +++ b/meta-cube/recipes-support/overc-utils/source/cube-ctl @@ -1095,7 +1095,7 @@ case "${cmd}" in out_dir="${container_dir}/" fi - if [ -n "${track_containers}" -a ! -e ${out_dir} ]; then + if [ -n "${track_containers}" -a ! -e ${out_dir}${container_name} ]; then ${SBINDIR}/overc-ctl subvol ${container_name} -o ${out_dir} fi mkdir -p "${out_dir}/${container_name}/rootfs"