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 1Qsloa-0006PY-Ot for garchives@archives.gentoo.org; Mon, 15 Aug 2011 01:18:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B89421C39F; Mon, 15 Aug 2011 01:17:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C94D921C39F for ; Mon, 15 Aug 2011 01:17:56 +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 29B741B4067 for ; Mon, 15 Aug 2011 01:17:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 434C680040 for ; Mon, 15 Aug 2011 01:17:55 +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: <59ef3756049e55206ce30f9caceb6c2fa4566729.hexxeh@gentoo> Subject: [gentoo-commits] proj/gentoaster:master commit in: /, web/ X-VCS-Repository: proj/gentoaster X-VCS-Files: daemon.php web/config.php web/index.php X-VCS-Directories: / web/ X-VCS-Committer: hexxeh X-VCS-Committer-Name: Liam McLoughlin X-VCS-Revision: 59ef3756049e55206ce30f9caceb6c2fa4566729 Date: Mon, 15 Aug 2011 01:17:55 +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: f46f829ce8d9b4d5cef355cddcc39a69 commit: 59ef3756049e55206ce30f9caceb6c2fa4566729 Author: Liam McLoughlin hexxeh net> AuthorDate: Mon Aug 15 01:17:34 2011 +0000 Commit: Liam McLoughlin hexxeh net> CommitDate: Mon Aug 15 01:17:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoaster.gi= t;a=3Dcommit;h=3D59ef3756 Add default disk size option, fix daemon kernel config bug --- daemon.php | 2 ++ web/config.php | 3 +++ web/index.php | 2 +- 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/daemon.php b/daemon.php index 60c1616..04e0f4c 100644 --- a/daemon.php +++ b/daemon.php @@ -111,6 +111,8 @@ preg_match("/Step (.+):/", $progressLine, $match= es); if (sizeof($matches) > 0) { $job->sendStatus($matches[1], $progressMagic= ); + } elseif (substr($progressLine, 0, 5) =3D=3D "ye= s: ") { + // do nothing } else { $nonstatusOutput .=3D $progressLine; } diff --git a/web/config.php b/web/config.php index bdb5b47..9d86c0c 100644 --- a/web/config.php +++ b/web/config.php @@ -33,6 +33,9 @@ // What should we set as the default list of packages? define("DEFAULT_KEYWORDS", ""); =20 + // What should the default virtual machine disk size be? + define("DEFAULT_DISK_SIZE", 8192); + =20 // What should we limit the virtual machine disk size to? define("MAX_DISK_SIZE", 16384); =20 diff --git a/web/index.php b/web/index.php index aa17151..8b50ba9 100644 --- a/web/index.php +++ b/web/index.php @@ -120,7 +120,7 @@