From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QfJk4-0000Ak-H7 for garchives@archives.gentoo.org; Fri, 08 Jul 2011 22:41:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9932721C071; Fri, 8 Jul 2011 22:41:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 07C2221C071 for ; Fri, 8 Jul 2011 22:41:31 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 72AAE2AC10D for ; Fri, 8 Jul 2011 22:41:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CAD858003D for ; Fri, 8 Jul 2011 22:41:30 +0000 (UTC) From: "Liam McLoughlin" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Liam McLoughlin" Message-ID: Subject: [gentoo-commits] proj/gentoaster:master commit in: / X-VCS-Repository: proj/gentoaster X-VCS-Files: create_image.sh X-VCS-Directories: / X-VCS-Committer: hexxeh X-VCS-Committer-Name: Liam McLoughlin X-VCS-Revision: a5205c200d4c7085037d9679d8182e751a8f30c6 Date: Fri, 8 Jul 2011 22:41:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a03e03b1eaf8fedf16135644e399bdd7 commit: a5205c200d4c7085037d9679d8182e751a8f30c6 Author: Liam McLoughlin hexxeh net> AuthorDate: Fri Jul 8 22:41:21 2011 +0000 Commit: Liam McLoughlin hexxeh net> CommitDate: Fri Jul 8 22:41:21 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoaster.gi= t;a=3Dcommit;h=3Da5205c20 Moving to non-calcuated RootFS size (this makes more sense if we're using= a two part slider on the WebUI) --- create_image.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/create_image.sh b/create_image.sh index b2d264c..0cc7f4f 100755 --- a/create_image.sh +++ b/create_image.sh @@ -43,7 +43,7 @@ source ${RUNNING_DIRECTORY}/parse_config.sh ${FLAGS_con= fig} 2>/dev/null || handl # Generate a few helper variables using the configuration file =20 IMAGE_NAME=3D"${BUILD_ID}.image" -ROOT_MEGABYTES=3D$(( ${IMAGE_MEGABYTES} - ( ${BOOT_MEGABYTES} + ${SWAP_M= EGABYTES} + 1 ) )) +IMAGE_MEGABYTES=3D$(( ${BOOT_MEGABYTES} + ${SWAP_MEGABYTES} + ${ROOT_MEG= ABYTES} + 1 )) IMAGE_BYTES=3D$(( ${IMAGE_MEGABYTES} * 1024 * 1024 )) IMAGES_OUTPUT_PATH=3D`pwd` IMAGE_WORK_PATH=3D"${IMAGES_OUTPUT_PATH}/${BUILD_ID}"