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 e825b015ad2d940427caa9107dcd34a661c00ed2 (commit) via 7b6548b273fc6cf3bd191f157304952cbbf21986 (commit) from 5d924403f2508c8ef34ca148ec49aeb641a8f7e6 (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 e825b015ad2d940427caa9107dcd34a661c00ed2 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Dec 27 19:18:25 2010 +0100

qemu-kqemu: fix bios default.

commit 7b6548b273fc6cf3bd191f157304952cbbf21986 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Dec 27 19:17:07 2010 +0100

Installer: add "authoritative" to default dhcp config.

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

Summary of changes: config/rootfiles/packages/qemu-kqemu | 1 + lfs/qemu-kqemu | 8 +++++--- src/install+setup/setup/dhcp.c | 1 + .../qemu-kqemu_change-default-kqemu-bios.patch | 12 ++++++++++++ 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 src/patches/qemu-kqemu_change-default-kqemu-bios.patch

Difference in files: diff --git a/config/rootfiles/packages/qemu-kqemu b/config/rootfiles/packages/qemu-kqemu index f70d328..7a908f7 100644 --- a/config/rootfiles/packages/qemu-kqemu +++ b/config/rootfiles/packages/qemu-kqemu @@ -1 +1,2 @@ usr/bin/qemu-kqemu +usr/share/qemu/bios-kqemu.bin diff --git a/lfs/qemu-kqemu b/lfs/qemu-kqemu index a3c99b4..38dc6a7 100644 --- a/lfs/qemu-kqemu +++ b/lfs/qemu-kqemu @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)-kqemu PROG = qemu-kqemu -PAK_VER = 2 +PAK_VER = 3

DEPS = "sdl qemu"

@@ -77,9 +77,11 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-kqemu_change-default-kqemu-bios.patch cd $(DIR_APP) && ./configure --prefix=/usr \ --target-list="i386-softmmu" cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && cp i386-softmmu/qemu /usr/bin/qemu-kqemu + cd $(DIR_APP) && cp -f i386-softmmu/qemu /usr/bin/qemu-kqemu + cd $(DIR_APP) && cp -f pc-bios/bios.bin /usr/share/qemu/bios-kqemu.bin @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/install+setup/setup/dhcp.c b/src/install+setup/setup/dhcp.c index f969759..332a807 100644 --- a/src/install+setup/setup/dhcp.c +++ b/src/install+setup/setup/dhcp.c @@ -208,6 +208,7 @@ int handledhcp(void) file = fopen(CONFIG_ROOT "/dhcp/dhcpd.conf", "w"); fprintf(file, "ddns-update-style none;\n"); + fprintf(file, "authoritative;\n"); fprintf(file, "subnet %s netmask %s\n", greennetaddress, greennetmask); fprintf(file, "{\n"); fprintf(file, "\toption subnet-mask %s;\n", greennetmask); diff --git a/src/patches/qemu-kqemu_change-default-kqemu-bios.patch b/src/patches/qemu-kqemu_change-default-kqemu-bios.patch new file mode 100644 index 0000000..a36c54e --- /dev/null +++ b/src/patches/qemu-kqemu_change-default-kqemu-bios.patch @@ -0,0 +1,12 @@ +diff -Naur qemu-0.11.1.org/hw/pc.c qemu-0.11.1/hw/pc.c +--- qemu-0.11.1.org/hw/pc.c 2009-12-02 21:27:02.000000000 +0100 ++++ qemu-0.11.1/hw/pc.c 2010-12-27 12:09:41.845206649 +0100 +@@ -43,7 +43,7 @@ + /* Show multiboot debug output */ + //#define DEBUG_MULTIBOOT + +-#define BIOS_FILENAME "bios.bin" ++#define BIOS_FILENAME "bios-kqemu.bin" + #define VGABIOS_FILENAME "vgabios.bin" + #define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin" +

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