Date: Mon, 18 Jul 2011 01:04:19 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r224165 - projects/portbuild/scripts Message-ID: <201107180104.p6I14JQQ098578@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon (doc,ports committer) Date: Mon Jul 18 01:04:19 2011 New Revision: 224165 URL: http://svn.freebsd.org/changeset/base/224165 Log: Modernize the check for "enough disk space in /tmp". This seems to cut down on the "truncated dependent packages" problem. Modified: projects/portbuild/scripts/claim-chroot Modified: projects/portbuild/scripts/claim-chroot ============================================================================== --- projects/portbuild/scripts/claim-chroot Mon Jul 18 01:02:44 2011 (r224164) +++ projects/portbuild/scripts/claim-chroot Mon Jul 18 01:04:19 2011 (r224165) @@ -93,15 +93,28 @@ if [ ! -z "${squid_dir}" ]; then fi fi -# Check for enough disk space -df=$(df -k ${scratchdir} | tail -1 | awk '{print $4}') - -if [ ${df} -lt 102400 ]; then - touch ${scratchdir}/.disk - echo "error disk" - exit 1 +# Check for enough disk space, in gigabytes. hack xxxm to 1g. +if [ "${use_md_swap}" = "1" ]; then + used=$(swapinfo -g | tail -1 | awk '{print $4}') + needed=`echo ${md_size} | sed -e "s/.*m/1/;s/g//"` + if [ ${used} -lt ${needed} ]; then + touch ${scratchdir}/.swap + echo "error swap" + exit 1 + else + rm -f ${scratchdir}/.swap + fi else - rm -f ${scratchdir}/.disk + used=$(df -g ${scratchdir} | tail -1 | awk '{print $4}') + # XXX MCL FIX HARDCODING! + needed="8" + if [ ${used} -lt ${needed} ]; then + touch ${scratchdir}/.disk + echo "error disk" + exit 1 + else + rm -f ${scratchdir}/.disk + fi fi found=0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107180104.p6I14JQQ098578>