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, next has been updated via ddd1589dabae74ed08ff00c51355ef7f3243ccc2 (commit) via 6945083ea536800184d56cab513176b5718b9eaf (commit) from 0cc5df4e29dc872bdcb475875077f4339dc0d435 (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 ddd1589dabae74ed08ff00c51355ef7f3243ccc2 Author: Christian Schmidt maniacikarus@ipfire.org Date: Tue Mar 16 21:11:13 2010 +0100

Changed installer. We now support ext2 installation and dropped reiser4.

System now calculates a smaller swap partition since there is no more need to have this large swapfiles with a large amount of total ram available.

commit 6945083ea536800184d56cab513176b5718b9eaf Author: Christian Schmidt maniacikarus@ipfire.org Date: Tue Mar 16 21:09:44 2010 +0100

Added ability to change syslog to async logging.

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

Summary of changes: html/cgi-bin/logs.cgi/config.dat | 6 ++++++ src/install+setup/install/main.c | 26 +++++++++++++------------- src/misc-progs/syslogdctrl.c | 6 +++++- 3 files changed, 24 insertions(+), 14 deletions(-)

Difference in files: diff --git a/html/cgi-bin/logs.cgi/config.dat b/html/cgi-bin/logs.cgi/config.dat index f39981e..392edac 100644 --- a/html/cgi-bin/logs.cgi/config.dat +++ b/html/cgi-bin/logs.cgi/config.dat @@ -32,6 +32,7 @@ $logsettings{'LOGWATCH_LEVEL'} = 'Low'; $logsettings{'LOGWATCH_KEEP'} = '56'; my @VS = ('15','50','100','150','250','500'); $logsettings{'ENABLE_REMOTELOG'} = 'off'; +$logsettings{'ENABLE_ASYNCLOG'} = 'off'; $logsettings{'REMOTELOG_ADDR'} = ''; $logsettings{'VARMESSAGES'} = 'cron.none;daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.*'; $logsettings{'ACTION'} = ''; @@ -66,6 +67,10 @@ if ($logsettings{'ACTION'} eq $Lang::tr{'save'})

&General::readhash("${General::swroot}/logging/settings", %logsettings);

+$checked{'ENABLE_ASYNCLOG'}{'off'} = ''; +$checked{'ENABLE_ASYNCLOG'}{'on'} = ''; +$checked{'ENABLE_ASYNCLOG'}{$logsettings{'ENABLE_ASYNCLOG'}} = "checked='checked'"; + $checked{'ENABLE_REMOTELOG'}{'off'} = ''; $checked{'ENABLE_REMOTELOG'}{'on'} = ''; $checked{'ENABLE_REMOTELOG'}{$logsettings{'ENABLE_REMOTELOG'}} = "checked='checked'"; @@ -150,6 +155,7 @@ END print <<END <table width='100%'> <tr> + <td class='base'>$Lang::tr{'enabled'}</td><td><input type='checkbox' name='ENABLE_ASYNCLOG' $checked{'ENABLE_ASYNCLOG'}{'on'} /></td> <td>$Lang::tr{'log var messages'}</td><td><input type='text' name='VARMESSAGES' size='50' value='$logsettings{'VARMESSAGES'}' /></td> </tr> </table> diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index a1dd90d..c16bde8 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -14,9 +14,9 @@ #define INST_FILECOUNT 6200 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"

-#define REISER4 0 -#define REISERFS 1 -#define EXT3 2 +#define EXT2 0 +#define REISERFS 2 +#define EXT3 1

FILE *flog = NULL; char *mylog; @@ -43,7 +43,7 @@ int main(int argc, char *argv[]) int rc = 0; char commandstring[STRING_SIZE]; char mkfscommand[STRING_SIZE]; - char *fstypes[] = { "Reiser4", "ReiserFS", "ext3", NULL }; + char *fstypes[] = { "ext2", "ext3", "ReiserFS", NULL }; int fstype = REISERFS; int choice; int i; @@ -304,10 +304,10 @@ int main(int argc, char *argv[]) /* Calculating Swap-Size dependend of Ram Size */ if (memory < 128) swap_file = 32; - else if (memory >= 1024) - swap_file = 512; + else if (memory > 512) + swap_file = 256; else - swap_file = memory; + swap_file = memory / 4; /* Calculating Root-Size dependend of Max Disk Space */ if ( disk < 756 ) @@ -366,9 +366,9 @@ int main(int argc, char *argv[]) goto EXIT; } - if (fstype == REISER4) { - mysystem("/sbin/modprobe reiser4"); - sprintf(mkfscommand, "/sbin/mkfs.reiser4 -y"); + if (fstype == EXT2) { + mysystem("/sbin/modprobe ext2"); + sprintf(mkfscommand, "/sbin/mke2fs -T ext2 -c"); } else if (fstype == REISERFS) { mysystem("/sbin/modprobe reiserfs"); sprintf(mkfscommand, "/sbin/mkreiserfs -f"); @@ -483,9 +483,9 @@ int main(int argc, char *argv[]) /* Update /etc/fstab */ replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode_part_run); - if (fstype == REISER4) { - replace("/harddisk/etc/fstab", "FSTYPE", "reiser4"); - replace("/harddisk/boot/grub/grub.conf", "MOUNT", "rw"); + if (fstype == EXT2) { + replace("/harddisk/etc/fstab", "FSTYPE", "ext2"); + replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); } else if (fstype == REISERFS) { replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs"); replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c index 9880ee2..0e10e16 100644 --- a/src/misc-progs/syslogdctrl.c +++ b/src/misc-progs/syslogdctrl.c @@ -123,9 +123,13 @@ int main(void) close(config_fd);

/* Replace the logging option*/ - safe_system("grep -v '/var/log/messages' < /etc/syslog.conf.new > /etc/syslog.conf.tmp && mv /etc/syslog.conf.tmp /etc/syslog.conf.new"); + + if (strcmp(ENABLE_ASYNCLOG,"on")) + snprintf(command, STRING_SIZE-1, "printf '%s -/var/log/messages' >> /etc/syslog.conf.new", varmessages ); + else snprintf(command, STRING_SIZE-1, "printf '%s /var/log/messages' >> /etc/syslog.conf.new", varmessages ); + safe_system(command);

if (rename("/etc/syslog.conf.new", "/etc/syslog.conf") == -1)

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