Commit 271d179d authored by Peter Hutterer's avatar Peter Hutterer
Browse files

template: reset the workingdir to / once done with DISTRO_EXEC



Because, interestingly enough, without that we don't actually remove the
/tmp/clone directory and then fail if we run a FDO_BASE_IMAGE off this
image (because mkdir is unhappy if the path exists).
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent ecad2125
......@@ -264,6 +264,7 @@
fi ;
$BUILDAH_RUN $CACHE $buildcntr bash -c "set -x ; $DISTRO_EXEC" ;
popd ;
buildah config --workingdir / --env HOME="$HOME" $buildcntr ;
rm -rf $buildmnt/tmp/clone ;
set +x ;
fi
......
......@@ -233,6 +233,7 @@
fi ;
$BUILDAH_RUN $CACHE $buildcntr bash -c "set -x ; $DISTRO_EXEC" ;
popd ;
buildah config --workingdir / --env HOME="$HOME" $buildcntr ;
rm -rf $buildmnt/tmp/clone ;
set +x ;
fi
......
......@@ -232,6 +232,7 @@
fi ;
$BUILDAH_RUN $CACHE $buildcntr bash -c "set -x ; $DISTRO_EXEC" ;
popd ;
buildah config --workingdir / --env HOME="$HOME" $buildcntr ;
rm -rf $buildmnt/tmp/clone ;
set +x ;
fi
......
......@@ -238,6 +238,7 @@
fi ;
$BUILDAH_RUN $CACHE $buildcntr bash -c "set -x ; $DISTRO_EXEC" ;
popd ;
buildah config --workingdir / --env HOME="$HOME" $buildcntr ;
rm -rf $buildmnt/tmp/clone ;
set +x ;
fi
......
......@@ -247,6 +247,7 @@
fi ;
$BUILDAH_RUN $CACHE $buildcntr bash -c "set -x ; $DISTRO_EXEC" ;
popd ;
buildah config --workingdir / --env HOME="$HOME" $buildcntr ;
rm -rf $buildmnt/tmp/clone ;
set +x ;
fi
......
......@@ -238,6 +238,7 @@
fi ;
$BUILDAH_RUN $CACHE $buildcntr bash -c "set -x ; $DISTRO_EXEC" ;
popd ;
buildah config --workingdir / --env HOME="$HOME" $buildcntr ;
rm -rf $buildmnt/tmp/clone ;
set +x ;
fi
......
......@@ -246,6 +246,7 @@
fi ;
$BUILDAH_RUN $CACHE $buildcntr bash -c "set -x ; $DISTRO_EXEC" ;
popd ;
buildah config --workingdir / --env HOME="$HOME" $buildcntr ;
rm -rf $buildmnt/tmp/clone ;
set +x ;
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment