This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via cebf16f471fe55591051d928526e293c7d7e0a23 (commit) via 6380cbd1236f76fcc6656f9f54831156fd030877 (commit) from 823c2183c22c3358a9d8d61b71993676f2c1aa5a (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit cebf16f471fe55591051d928526e293c7d7e0a23 Author: Christian Schmidt maniacikarus@ipfire.org Date: Mon Apr 26 18:37:19 2010 +0200

Fixed needed newline at EOF for collectd.

commit 6380cbd1236f76fcc6656f9f54831156fd030877 Author: Christian Schmidt maniacikarus@ipfire.org Date: Mon Apr 26 18:34:17 2010 +0200

Changed size of the swapfile again.

-----------------------------------------------------------------------

Summary of changes: config/collectd/collectd.custom | 3 +++ config/collectd/collectd.precache | 4 +++- src/install+setup/install/main.c | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-)

Difference in files: diff --git a/config/collectd/collectd.custom b/config/collectd/collectd.custom index e69de29..b28b04f 100644 --- a/config/collectd/collectd.custom +++ b/config/collectd/collectd.custom @@ -0,0 +1,3 @@ + + + diff --git a/config/collectd/collectd.precache b/config/collectd/collectd.precache index 3acc122..30d8d75 100644 --- a/config/collectd/collectd.precache +++ b/config/collectd/collectd.precache @@ -73,4 +73,6 @@ PreCacheChain "PreCache" <Target "write"> Plugin "rrdtool" </Target> -</Chain> \ No newline at end of file +</Chain> + + diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index c16bde8..4038f7c 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -302,9 +302,9 @@ int main(int argc, char *argv[]) fprintf(flog, "Disksize = %ld, memory = %ld", disk, memory); /* Calculating Swap-Size dependend of Ram Size */ - if (memory < 128) - swap_file = 32; - else if (memory > 512) + if (memory =< 256) + swap_file = 128; + else if (memory =< 1024 && memory > 256) swap_file = 256; else swap_file = memory / 4;

hooks/post-receive -- IPFire 2.x development tree