[checkmk-commits] Terminate make-agent on failure; Fixed apt installation from chroot

Module: check_mk Branch: master Commit: 8aa7963cd898495ae0d44366c6add31a9413b619 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8aa7963cd89849… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 18 09:35:27 2017 +0200 Terminate make-agent on failure; Fixed apt installation from chroot Change-Id: I7244bcdfd758b81885f0bc8a2ddd4186296549cf --- agents/windows/make-agent | 2 ++ agents/windows/make-chroot | 3 +++ 2 files changed, 5 insertions(+) diff --git a/agents/windows/make-agent b/agents/windows/make-agent index 5cd235c..ab91780 100755 --- a/agents/windows/make-agent +++ b/agents/windows/make-agent @@ -8,6 +8,8 @@ # Possible make targets. By default, a parallel build and # install-strip (non-debug) is done and an msi installer produced. +set -e + . build.sh parse-args "$@" diff --git a/agents/windows/make-chroot b/agents/windows/make-chroot index 9a76a7e..96f0528 100755 --- a/agents/windows/make-chroot +++ b/agents/windows/make-chroot @@ -144,6 +144,9 @@ if [ ! -h $CHROOT_PATH/usr/bin/python ] ; then ln -sf python2.7 $CHROOT_PATH/usr/bin/python fi +# "Disable" apt privilege dropping in chroot +sed -ri 's/^_apt:x:[0-9]+:/_apt:x:0:/g' $CHROOT_PATH/etc/passwd + # We need to enable 32bit Wine ./do-chroot "dpkg --add-architecture i386 && apt-get update && apt-get -y install wine32"