From d131b056a7f0b3bd23df58aa87842dbdbec033ec Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Fri, 7 Apr 2023 12:31:33 -0700 Subject: [PATCH] turn off error checking temporarily in live image --- iso/empanadas/empanadas/templates/buildLiveImage.tmpl.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/iso/empanadas/empanadas/templates/buildLiveImage.tmpl.sh b/iso/empanadas/empanadas/templates/buildLiveImage.tmpl.sh index c4be936..938e487 100644 --- a/iso/empanadas/empanadas/templates/buildLiveImage.tmpl.sh +++ b/iso/empanadas/empanadas/templates/buildLiveImage.tmpl.sh @@ -25,13 +25,15 @@ done # # Even so, we don't support it. These checks are to prevent (you) from # getting needless headaches. +set +e [[ -f /run/.containerenv ]]; container_ec=$? grep -q "0::/$" /proc/1/cgroup; pid_ec=$? grep -q "0::/$" /proc/self/cgroup; self_ec=$? -if [[ "$pid_ec" == "0" ]] || [[ "$container_ec" == 0 ]] || [[ "$self_ec" == 0 ]]; then +if [[ "$pid_ec" == "0" ]] || [[ "$self_ec" == 0 ]]; then exit 23 fi +set -e cd /builddir