From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a404b96db8f06cdab4d07bfa4cd1af0369e45e0b
Date: Tue, 21 May 2013 13:23:34 +0200 [thread overview]
Message-ID: <20130521112335.1EAF3200DA@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3244 bytes --]
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 a404b96db8f06cdab4d07bfa4cd1af0369e45e0b (commit)
via 574fe9184dc31eb3bf882bcc43604c3dccd9a3f7 (commit)
via dcee88ba68ca5910bdef8b9e6f820dd8c003b2e0 (commit)
from 464d238a61a102ff0729f2cc3c23f05dab03aa87 (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 a404b96db8f06cdab4d07bfa4cd1af0369e45e0b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 21 13:23:15 2013 +0200
Add setup to core update 69.
commit 574fe9184dc31eb3bf882bcc43604c3dccd9a3f7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 21 13:18:34 2013 +0200
Reset unattended installation configuration to English/US.
commit dcee88ba68ca5910bdef8b9e6f820dd8c003b2e0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 21 13:18:15 2013 +0200
Reset default keymap to us.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/{oldcore/66 => core/69}/filelists/setup | 0
config/syslinux/unattended.conf | 10 +++++-----
src/install+setup/setup/keymap.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
copy config/rootfiles/{oldcore/66 => core/69}/filelists/setup (100%)
Difference in files:
diff --git a/config/rootfiles/core/69/filelists/setup b/config/rootfiles/core/69/filelists/setup
new file mode 120000
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 5adf279..169463b 100644
--- 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 accf92a..b143492 100644
--- 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;
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2013-05-21 11:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130521112335.1EAF3200DA@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox