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 208c85be4c473c4a6cfe056097ea323da7a955b3 (commit)
via 215bd18d84536111e8f44067d4ce96df705af522 (commit)
via eea897b3282c4fee8d580364b403d349100c7e22 (commit)
from eb07028a850a5f42b2fe8562b463e17b493cc51f (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 208c85be4c473c4a6cfe056097ea323da7a955b3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Dec 18 00:10:14 2010 +0100
kernel: Disable MMIO for sundance module.
Causes some errors on cards by DLINK with this chip.
commit 215bd18d84536111e8f44067d4ce96df705af522
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 17 12:57:46 2010 +0100
installer: Make English the default language.
commit eea897b3282c4fee8d580364b403d349100c7e22
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 17 12:43:54 2010 +0100
installer: Make ext4 the default filesystem.
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.i586-ipfire | 2 +-
src/install+setup/install/main.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 9d7b2db..a3ecac1 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1608,7 +1608,7 @@ CONFIG_SIS900=m
CONFIG_EPIC100=m
CONFIG_SMSC9420=m
CONFIG_SUNDANCE=m
-CONFIG_SUNDANCE_MMIO=y
+# CONFIG_SUNDANCE_MMIO is not set
CONFIG_TLAN=m
CONFIG_KS8842=m
CONFIG_KS8851_MLL=m
diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 9ea3f31..0172f8b 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
char commandstring[STRING_SIZE];
char mkfscommand[STRING_SIZE];
char *fstypes[] = { "ext2", "ext3", "ext4", "ReiserFS", NULL };
- int fstype = EXT3;
+ int fstype = EXT4;
int choice;
int i;
int found = 0;
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
/* German is the default */
for (choice = 0; langnames[choice]; choice++)
{
- if (strcmp(langnames[choice], "Deutsch") == 0)
+ if (strcmp(langnames[choice], "English") == 0)
break;
}
if (!langnames[choice])
hooks/post-receive
--
IPFire 2.x development tree