[PATCH 1/1] fix(schroot): only mount base-apt if enabled

[Felix Moessbauer]

On partial rebuilds we might work on rootfs that do not have the
/base-apt directory anymore. This currently fails, as we unconditionally
mount the /base-apt when creating the schroot. This happens when running
any imager_run command on such a chroot. We fix it by only mounting
base-apt if needed.

Signed-off-by: Felix Moessbauer <felix.mo...@siemens.com>
---
meta/classes-recipe/sbuild.bbclass | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/classes-recipe/sbuild.bbclass b/meta/classes-recipe/sbuild.bbclass
index 95dadee3..af1216ea 100644
--- a/meta/classes-recipe/sbuild.bbclass
+++ b/meta/classes-recipe/sbuild.bbclass
@@ -43,8 +43,10 @@ EOF
cp -rf "${SCHROOT_CONF}/sbuild" "${SBUILD_CONF_DIR}"
sbuild_fstab="${SBUILD_CONF_DIR}/fstab"

- fstab_baseapt="${REPO_BASE_DIR} /base-apt none rw,bind,private 0 0"
- grep -qxF "${fstab_baseapt}" ${sbuild_fstab} || echo "${fstab_baseapt}" >> ${sbuild_fstab}
+ if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then
+ fstab_baseapt="${REPO_BASE_DIR} /base-apt none rw,bind,private 0 0"
+ grep -qxF "${fstab_baseapt}" ${sbuild_fstab} || echo "${fstab_baseapt}" >> ${sbuild_fstab}
+ fi

fstab_pkgdir="${WORKDIR} /home/builder/${BPN} none rw,bind,private 0 0"
grep -qxF "${fstab_pkgdir}" ${sbuild_fstab} || echo "${fstab_pkgdir}" >> ${sbuild_fstab}
--
2.53.0