[checkmk-commits] Added CHROOT_NAME to chroot directory hierarchy

Module: check_mk Branch: master Commit: bb98c18468f1eaaa5dd4360c0bcfc9bc4ffd1203 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bb98c18468f1ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 24 16:02:46 2017 +0200 Added CHROOT_NAME to chroot directory hierarchy Change-Id: I89edbb26bd67786e70de3577afa753b25f99e1fe --- agents/windows/make-agent | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/agents/windows/make-agent b/agents/windows/make-agent index c664283..b7ea530 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -25,7 +25,6 @@ base="$(realpath ../..)" # May be set from external environment. Otherwise use chroot # directory in agents/windows -export CHROOT_PATH=${CHROOT_PATH:-$base/agents/windows/chroot} export CHROOT_BUILD_DIR=${CHROOT_BUILD_DIR:-build} export CHROOT_NAME=${CHROOT_NAME:-WinAgent} @@ -35,6 +34,14 @@ if [ ! -f "$base/agents/windows/$versionfile" ] ; then exit 1 fi +# Get possible CHROOT_BASE_PATH from environment. Default to the "chroot" +# subdirectory. Add the CHROOT_NAME and CHROOT_VERSION as additional path +# elements to make +# a) different namespaces possible for (windows agent, agent updater) +# b) parallel builds of different chroot versions possible +CHROOT_BASE_PATH=${CHROOT_BASE_PATH:-$base/$base_rel_dir/chroot} +export CHROOT_PATH=$CHROOT_PATH/$CHROOT_NAME/$CHROOT_VERSION + # Realize a file based locking for the chroot setup. There must be only # a single caller executing the setup of a chroot. Once the chroot was # created, multiple jobs may be executed in the chroot simultaneously,