From 30d57ca63a7967feb8e8c5c22e6771c03d8617fe Mon Sep 17 00:00:00 2001 From: Alexander Evseev Date: Wed, 21 Jun 2017 15:55:10 +0300 Subject: [PATCH] Use --old-chroot when building RPM packages New mock by default uses systemd-based chroot for all run modes (init/build/etc). Change-Id: I224d120acfd4410024106b0037fe9ceeff87fe1c --- perestroika/docker-builder/build-rpm-package.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/perestroika/docker-builder/build-rpm-package.sh b/perestroika/docker-builder/build-rpm-package.sh index 8b05761..0ab8411 100755 --- a/perestroika/docker-builder/build-rpm-package.sh +++ b/perestroika/docker-builder/build-rpm-package.sh @@ -33,15 +33,15 @@ docker run ${DNSPARAM} --privileged --rm -v ${CACHEPATH}:/srv/mock:ro \ $EXTRACMD echo 'Current config file:' cat /etc/mock/centos-${DIST_VERSION}-x86_64.cfg - su - abuild -c 'mock -r centos-${DIST_VERSION}-x86_64 --verbose --update' + su - abuild -c 'mock -r centos-${DIST_VERSION}-x86_64 --verbose --update --old-chroot' chown -R abuild.mock /home/abuild [[ \$(ls /home/abuild/rpmbuild/*.src.rpm | wc -l) -eq 0 ]] \ && su - abuild -c 'mock -r centos-${DIST_VERSION}-x86_64 --no-clean --no-cleanup-after --buildsrpm --verbose \ --sources=/home/abuild/rpmbuild --resultdir=/home/abuild/rpmbuild --buildsrpm \ - --spec=\$(ls /home/abuild/rpmbuild/*.spec)' + --spec=\$(ls /home/abuild/rpmbuild/*.spec) --old-chroot' rm -rf /home/abuild/rpmbuild/build su - abuild -c 'mock -r centos-${DIST_VERSION}-x86_64 --no-clean --no-cleanup-after --verbose \ - --resultdir=/home/abuild/rpmbuild/build \$(ls /home/abuild/rpmbuild/*.src.rpm)' + --resultdir=/home/abuild/rpmbuild/build \$(ls /home/abuild/rpmbuild/*.src.rpm) --old-chroot' echo \$? > /home/abuild/rpmbuild/build/exitstatus.mock umount -f /var/cache/mock /srv/tmpfs/cache rm -rf /srv/tmpfs