Merge branch 'lang-tr' into next

diff --git a/config/rootfiles/core/69/filelists/setup b/config/rootfiles/core/69/filelists/setup
new file mode 120000 (symlink)
index 0000000..209374b
--- /dev/null
+++ b/config/rootfiles/core/69/filelists/setup
@@ -0,0 +1 @@
+../../../common/setup
\ No newline at end of file

diff --git a/config/syslinux/unattended.conf b/config/syslinux/unattended.conf
index 5adf279001c2c7274bbf8235a77172086a7284ee..169463bb9cfce805c112a57e2583fe0c377b06af 100644 (file)
--- a/config/syslinux/unattended.conf
+++ b/config/syslinux/unattended.conf
@@ -1,12 +1,12 @@
 DOMAINNAME=localdomain
 HOSTNAME=ipfire
-KEYMAP=/lib/kbd/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz
-LANGUAGE=de
+KEYMAP=/lib/kbd/keymaps/i386/qwerty/us.map.gz
+LANGUAGE=en
 TIMEZONE=/usr/share/zoneinfo/posix/Europe/Berlin
 THEME=ipfire
-GREEN_ADDRESS=192.168.180.30
+GREEN_ADDRESS=192.168.0.1
 GREEN_NETMASK=255.255.255.0
-GREEN_NETADDRESS=192.168.180.0
-GREEN_BROADCAST=192.168.180.255
+GREEN_NETADDRESS=192.168.0.0
+GREEN_BROADCAST=192.168.0.255
 ROOT_PASSWORD=ipfire
 ADMIN_PASSWORD=ipfire

diff --git a/src/install+setup/setup/keymap.c b/src/install+setup/setup/keymap.c
index accf92a0302016d3c18bd32f42261652e31cd581..b143492a1345df4a07d3968c79cf6b972765581c 100644 (file)
--- a/src/install+setup/setup/keymap.c
+++ b/src/install+setup/setup/keymap.c
@@ -69,7 +69,7 @@ int handlekeymap(void)
                return 0;
        }       
        
-       strcpy(keymap, "/lib/kbd/keymaps/i386/qwertz/de-latin1-nodeadkeys.map.gz");
+       strcpy(keymap, "/lib/kbd/keymaps/i386/qwerty/us.map.gz");
        findkey(kv, "KEYMAP", keymap);
        
        choice = 0;