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 c8d680dc8df1b2f7138ae3a8745fd021b0f7ae42 (commit) via 30793ae111f24fccea798759e87b72487fc23531 (commit) from 57e682114e87ea9ed4cc419aea17dfd63cf3917b (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 c8d680dc8df1b2f7138ae3a8745fd021b0f7ae42 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 1 16:34:41 2010 +0100
Add ext4 support to installer.
commit 30793ae111f24fccea798759e87b72487fc23531 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 1 09:18:46 2010 +0100
Proxy.cgi changes for new squid.
-----------------------------------------------------------------------
Summary of changes: html/cgi-bin/proxy.cgi | 16 ++++++++++------ langs/de/install/lang_de.c | 9 ++++++++- langs/en/install/lang_en.c | 9 ++++++++- langs/es/install/lang_es.c | 9 ++++++++- langs/fr/install/lang_fr.c | 9 ++++++++- src/dracut/dracut.conf | 2 +- src/install+setup/install/main.c | 22 +++++++++++++++++----- 7 files changed, 60 insertions(+), 16 deletions(-)
Difference in files: diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 137f528..aaaec87 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -3319,7 +3319,7 @@ END }
print FILE <<END -acl all src 0.0.0.0/0.0.0.0 +acl all src all acl localhost src 127.0.0.1/255.255.255.255 END ; @@ -3811,19 +3811,23 @@ END
if ($proxysettings{'FORWARD_IPADDRESS'} eq 'off') { - print FILE "header_access X-Forwarded-For deny all\n"; + print FILE "request_header_access X-Forwarded-For deny all\n"; + print FILE "reply_header_access X-Forwarded-For deny all\n"; } if ($proxysettings{'FORWARD_VIA'} eq 'off') { - print FILE "header_access Via deny all\n"; + print FILE "request_header_access Via deny all\n"; + print FILE "reply_header_access Via deny all\n"; } if (!($proxysettings{'FAKE_USERAGENT'} eq '')) { - print FILE "header_access User-Agent deny all\n"; + print FILE "request_header_access User-Agent deny all\n"; + print FILE "reply_header_access User-Agent deny all\n"; } if (!($proxysettings{'FAKE_REFERER'} eq '')) { - print FILE "header_access Referer deny all\n"; + print FILE "request_header_access Referer deny all\n"; + print FILE "reply_header_access Referer deny all\n"; }
print FILE "\n"; @@ -3878,7 +3882,7 @@ END if (!-z $extgrp) { print FILE "reply_body_max_size 0 deny for_extended_users\n"; } } } - print FILE "reply_body_max_size $replybodymaxsize deny all\n\n"; +#FIX ME print FILE "reply_body_max_size $replybodymaxsize deny all\n\n";
print FILE "visible_hostname"; if ($proxysettings{'VISIBLE_HOSTNAME'} eq '') diff --git a/langs/de/install/lang_de.c b/langs/de/install/lang_de.c index a62cb8d..87e06cf 100644 --- a/langs/de/install/lang_de.c +++ b/langs/de/install/lang_de.c @@ -575,6 +575,13 @@ char *de_tr[] = { "Ich akzeptiere diese Lizenz.", /* TR_LICENSE_NOT_ACCEPTED */ "Die Lizenz wurde nicht akzeptiert. Abbruch!", - +/* TR_EXT2FS_DESCR */ +"Ext2 - Dateisystem ohne Journal (empfohlen für Flash)", +/* TR_EXT3FS_DESCR */ +"Ext3 - Dateisystem mit Journal", +/* TR_EXT4FS_DESCR */ +"Ext4 - Dateisystem mit Journal", +/* TR_REISERFS_DESCR */ +"ReiserFS - Dateisystem mit Journal", };
diff --git a/langs/en/install/lang_en.c b/langs/en/install/lang_en.c index 2977a20..ee65330 100644 --- a/langs/en/install/lang_en.c +++ b/langs/en/install/lang_en.c @@ -571,6 +571,13 @@ char *en_tr[] = { "I accept this license.", /* TR_LICENSE_NOT_ACCEPTED */ "License not accepted. Exit!", - +/* TR_EXT2FS_DESCR */ +"Ext2 - Filesystem without Journal (suggested for flashdrives)", +/* TR_EXT3FS_DESCR */ +"Ext3 - Filesystem with Journal", +/* TR_EXT4FS_DESCR */ +"Ext4 - Filesystem with Journal", +/* TR_REISERFS_DESCR */ +"ReiserFS - Filesystem with Journal", };
diff --git a/langs/es/install/lang_es.c b/langs/es/install/lang_es.c index 9e3d52d..7dd0652 100644 --- a/langs/es/install/lang_es.c +++ b/langs/es/install/lang_es.c @@ -567,6 +567,13 @@ char *es_tr[] = { "I accept this license.", /* TR_LICENSE_NOT_ACCEPTED */ "License not accepted. Exit!", - +/* TR_EXT2FS_DESCR */ +"Ext2 - Filesystem without Journal (suggested for flashdrives)", +/* TR_EXT3FS_DESCR */ +"Ext3 - Filesystem with Journal", +/* TR_EXT4FS_DESCR */ +"Ext4 - Filesystem with Journal", +/* TR_REISERFS_DESCR */ +"ReiserFS - Filesystem with Journal", };
diff --git a/langs/fr/install/lang_fr.c b/langs/fr/install/lang_fr.c index c6b4e11..506faf5 100644 --- a/langs/fr/install/lang_fr.c +++ b/langs/fr/install/lang_fr.c @@ -567,6 +567,13 @@ char *fr_tr[] = { "I accept this license.", /* TR_LICENSE_NOT_ACCEPTED */ "License not accepted. Exit!", - +/* TR_EXT2FS_DESCR */ +"Ext2 - Filesystem without Journal (suggested for flashdrives)", +/* TR_EXT3FS_DESCR */ +"Ext3 - Filesystem with Journal", +/* TR_EXT4FS_DESCR */ +"Ext4 - Filesystem with Journal", +/* TR_REISERFS_DESCR */ +"ReiserFS - Filesystem with Journal", };
diff --git a/src/dracut/dracut.conf b/src/dracut/dracut.conf index a37038e..b671b7a 100644 --- a/src/dracut/dracut.conf +++ b/src/dracut/dracut.conf @@ -13,7 +13,7 @@ #add_drivers+=""
# list of kernel filesystem modules to be included in the generic initramfs -filesystems+="ext2 ext3 reiserfs reiser4 iso9660 vfat" +filesystems+="ext2 ext3 ext4 reiserfs reiser4 iso9660 vfat"
# build initrd only to boot current hardware #hostonly="yes" diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index dc3ac19..1f615d0 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -15,8 +15,9 @@ #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
#define EXT2 0 -#define REISERFS 2 #define EXT3 1 +#define EXT4 2 +#define REISERFS 3
FILE *flog = NULL; char *mylog; @@ -47,8 +48,8 @@ int main(int argc, char *argv[]) int rc = 0; char commandstring[STRING_SIZE]; char mkfscommand[STRING_SIZE]; - char *fstypes[] = { "ext2", "ext3", "ReiserFS", NULL }; - int fstype = REISERFS; + char *fstypes[] = { "ext2", "ext3", "ext4", "ReiserFS", NULL }; + int fstype = EXT3; int choice; int i; int found = 0; @@ -253,6 +254,12 @@ int main(int argc, char *argv[]) if (rc == 2) goto EXIT;
+ fstypes[0]=ctr[TR_EXT2FS_DESCR]; + fstypes[1]=ctr[TR_EXT3FS_DESCR]; + fstypes[2]=ctr[TR_EXT4FS_DESCR]; + fstypes[3]=ctr[TR_REISERFS_DESCR]; + fstypes[4]=NULL; + if (!unattended) { sprintf(message, ctr[TR_CHOOSE_FILESYSTEM]); rc = newtWinMenu( ctr[TR_CHOOSE_FILESYSTEM], message, @@ -260,7 +267,7 @@ int main(int argc, char *argv[]) ctr[TR_CANCEL], NULL); } else { rc = 1; - fstype = REISERFS; + fstype = EXT3; } if (rc == 2) goto EXIT; @@ -370,6 +377,9 @@ int main(int argc, char *argv[]) } else if (fstype == EXT3) { mysystem("/sbin/modprobe ext3"); sprintf(mkfscommand, "/sbin/mke2fs -T ext3"); + } else if (fstype == EXT4) { + mysystem("/sbin/modprobe ext4"); + sprintf(mkfscommand, "/sbin/mke2fs -T ext4"); }
snprintf(commandstring, STRING_SIZE, "/sbin/mke2fs -T ext2 -I 128 %s1", hdparams.devnode_part); @@ -482,7 +492,9 @@ int main(int argc, char *argv[]) replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); } else if (fstype == EXT3) { replace("/harddisk/etc/fstab", "FSTYPE", "ext3"); - NOJOURNAL: + replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); + } else if (fstype == EXT4) { + replace("/harddisk/etc/fstab", "FSTYPE", "ext4"); replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); }
hooks/post-receive -- IPFire 2.x development tree