Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/rootfiles/common/i586/ipfire-netboot b/config/rootfiles/common/i586/ipfire-netboot
new file mode 100644 (file)
index 0000000..b73261f
--- /dev/null
+++ b/config/rootfiles/common/i586/ipfire-netboot
@@ -0,0 +1,2 @@
+#usr/share/ipfire-netboot
+#usr/share/ipfire-netboot/ipxe.lkrn

diff --git a/config/rootfiles/common/i586/syslinux b/config/rootfiles/common/i586/syslinux
index 0c43b88be008a70aed3b4cc098ce0e5231b99de9..c9dc5346c5f5aec2b47d28b355ae87ad2939ac90 100644 (file)
--- a/config/rootfiles/common/i586/syslinux
+++ b/config/rootfiles/common/i586/syslinux
@@ -37,6 +37,7 @@
 #usr/share/syslinux/com32/include/bitsize/stdintconst.h
 #usr/share/syslinux/com32/include/bitsize/stdintlimits.h
 #usr/share/syslinux/com32/include/bufprintf.h
+#usr/share/syslinux/com32/include/cli.h
 #usr/share/syslinux/com32/include/colortbl.h
 #usr/share/syslinux/com32/include/com32.h
 #usr/share/syslinux/com32/include/console.h
@@ -101,6 +102,8 @@
 #usr/share/syslinux/com32/include/gplinclude/vpd/vpd.h
 #usr/share/syslinux/com32/include/gplinclude/zzjson
 #usr/share/syslinux/com32/include/gplinclude/zzjson/zzjson.h
+#usr/share/syslinux/com32/include/hw
+#usr/share/syslinux/com32/include/hw/vga.h
 #usr/share/syslinux/com32/include/ilog2.h
 #usr/share/syslinux/com32/include/inttypes.h
 #usr/share/syslinux/com32/include/klibc
@@ -112,13 +115,18 @@
 #usr/share/syslinux/com32/include/klibc/sysconfig.h
 #usr/share/syslinux/com32/include/libansi.h
 #usr/share/syslinux/com32/include/limits.h
+#usr/share/syslinux/com32/include/linux
+#usr/share/syslinux/com32/include/linux/list.h
 #usr/share/syslinux/com32/include/math.h
+#usr/share/syslinux/com32/include/menu.h
 #usr/share/syslinux/com32/include/minmax.h
 #usr/share/syslinux/com32/include/netinet
 #usr/share/syslinux/com32/include/netinet/in.h
 #usr/share/syslinux/com32/include/png.h
 #usr/share/syslinux/com32/include/pngconf.h
+#usr/share/syslinux/com32/include/refstr.h
 #usr/share/syslinux/com32/include/setjmp.h
+#usr/share/syslinux/com32/include/sort.h
 #usr/share/syslinux/com32/include/stdarg.h
 #usr/share/syslinux/com32/include/stdbool.h
 #usr/share/syslinux/com32/include/stddef.h
@@ -134,9 +142,11 @@
 #usr/share/syslinux/com32/include/sys/elf32.h
 #usr/share/syslinux/com32/include/sys/elf64.h
 #usr/share/syslinux/com32/include/sys/elfcommon.h
+#usr/share/syslinux/com32/include/sys/exec.h
 #usr/share/syslinux/com32/include/sys/fpu.h
 #usr/share/syslinux/com32/include/sys/gpxe.h
 #usr/share/syslinux/com32/include/sys/io.h
+#usr/share/syslinux/com32/include/sys/module.h
 #usr/share/syslinux/com32/include/sys/pci.h
 #usr/share/syslinux/com32/include/sys/stat.h
 #usr/share/syslinux/com32/include/sys/time.h
@@ -151,7 +161,6 @@
 #usr/share/syslinux/com32/include/syslinux/bootrm.h
 #usr/share/syslinux/com32/include/syslinux/config.h
 #usr/share/syslinux/com32/include/syslinux/disk.h
-#usr/share/syslinux/com32/include/syslinux/features.h
 #usr/share/syslinux/com32/include/syslinux/idle.h
 #usr/share/syslinux/com32/include/syslinux/io.h
 #usr/share/syslinux/com32/include/syslinux/keyboard.h
@@ -172,10 +181,8 @@
 #usr/share/syslinux/com32/include/unistd.h
 #usr/share/syslinux/com32/include/zconf.h
 #usr/share/syslinux/com32/include/zlib.h
-#usr/share/syslinux/com32/libcom32.a
-#usr/share/syslinux/com32/libcom32gpl.a
 #usr/share/syslinux/com32/libcom32upload.a
-#usr/share/syslinux/com32/libutil_com.a
+#usr/share/syslinux/com32/libgpl.c32
 #usr/share/syslinux/com32/libutil_lnx.a
 #usr/share/syslinux/config.c32
 #usr/share/syslinux/cpuid.c32
@@ -200,12 +207,12 @@
 #usr/share/syslinux/gpxelinux.0
 #usr/share/syslinux/gpxelinuxk.0
 #usr/share/syslinux/hdt.c32
+#usr/share/syslinux/hexdump.c32
 #usr/share/syslinux/host.c32
 #usr/share/syslinux/ifcpu.c32
 #usr/share/syslinux/ifcpu64.c32
 #usr/share/syslinux/ifmemdsk.c32
 #usr/share/syslinux/ifplop.c32
-#usr/share/syslinux/int18.com
 #usr/share/syslinux/isohdpfx.bin
 #usr/share/syslinux/isohdpfx_c.bin
 #usr/share/syslinux/isohdpfx_f.bin
@@ -216,6 +223,12 @@
 #usr/share/syslinux/isolinux.bin
 #usr/share/syslinux/kbdmap.c32
 #usr/share/syslinux/kontron_wdt.c32
+#usr/share/syslinux/ldlinux.c32
+#usr/share/syslinux/libcom32.c32
+#usr/share/syslinux/libgpl.c32
+#usr/share/syslinux/liblua.c32
+#usr/share/syslinux/libmenu.c32
+#usr/share/syslinux/libutil.c32
 #usr/share/syslinux/linux.c32
 #usr/share/syslinux/ls.c32
 #usr/share/syslinux/lua.c32
@@ -229,10 +242,8 @@
 #usr/share/syslinux/menu.c32
 #usr/share/syslinux/pcitest.c32
 #usr/share/syslinux/pmload.c32
-#usr/share/syslinux/poweroff.com
 #usr/share/syslinux/prdhcp.c32
 #usr/share/syslinux/pwd.c32
-#usr/share/syslinux/pxechain.com
 #usr/share/syslinux/pxechn.c32
 #usr/share/syslinux/pxelinux.0
 #usr/share/syslinux/reboot.c32
@@ -243,7 +254,6 @@
 #usr/share/syslinux/syslinux.com
 #usr/share/syslinux/syslinux.exe
 #usr/share/syslinux/syslinux64.exe
-#usr/share/syslinux/ver.com
 #usr/share/syslinux/vesainfo.c32
 #usr/share/syslinux/vesamenu.c32
 #usr/share/syslinux/vpdtest.c32

diff --git a/config/syslinux/boot.msg b/config/syslinux/boot.msg
deleted file mode 100644 (file)
index dd6fc1f..0000000
--- a/config/syslinux/boot.msg
+++ /dev/null
@@ -1,8 +0,0 @@
-\f 
-\18splash.lss
-
-
- -  To install IPFire on your system, press the \ f04<ENTER>\ f07 key.
- -  To disable vga mode, type: \ f04novga <ENTER>\ f07.  
- -  To test the memory in your system type: \ f04memtest <ENTER>\ f07.
-

diff --git a/config/syslinux/boot.png b/config/syslinux/boot.png
new file mode 100644 (file)
index 0000000..cd7463f
Binary files /dev/null and b/config/syslinux/boot.png differ

diff --git a/config/syslinux/splash.lss b/config/syslinux/splash.lss
deleted file mode 100644 (file)
index 0ab1f9b..0000000
Binary files a/config/syslinux/splash.lss and /dev/null differ

diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg
index 5a6a975a205c6df275a36ddbfbb9ac522d9af80e..88320890cc0ca736d0ace02498547ed9b1eac4d1 100644 (file)
--- a/config/syslinux/syslinux.cfg
+++ b/config/syslinux/syslinux.cfg
@@ -1,17 +1,96 @@
-TIMEOUT 5000
-DISPLAY boot.msg
-PROMPT 1
-DEFAULT vmlinuz
-  APPEND initrd=instroot vga=791 splash=silent ro
-LABEL ipfire
-  KERNEL vmlinuz
-  APPEND initrd=instroot vga=791 splash=silent ro
-LABEL novga
-  KERNEL vmlinuz
-  APPEND initrd=instroot ro
-LABEL unattended
-  KERNEL vmlinuz
-  APPEND initrd=instroot vga=791 splash=silent unattended ro
-LABEL memtest
-  KERNEL memtest
-  APPEND -
+
+UI vesamenu.c32
+PROMPT 0
+DEFAULT installer
+TIMEOUT 600
+
+MENU HSHIFT 0
+MENU WIDTH  40
+MENU MARGIN 1
+MENU VSHIFT 8
+MENU ROWS  10
+MENU HELPMSGROW 16
+MENU BACKGROUND boot.png
+MENU CLEAR
+
+# Coloring
+MENU COLOR TITLE       * #FFFFFFFF *
+MENU COLOR BORDER      * #00000000 #00000000 none
+MENU COLOR SEL         * #FFFFFFFF #FFE74C2E *
+MENU COLOR HOTSEL      1;7;37;40 #FFFFFFFF #99E74C2E *
+MENU COLOR TABMSG      * #FFFFFFFF #00000000 *
+
+MENU TITLE Welcome!
+
+LABEL installer
+       MENU LABEL Install IPFire VERSION
+       TEXT HELP
+Install the version of IPFire that is
+on this disk.
+       ENDTEXT
+       KERNEL vmlinuz
+       INITRD instroot
+       APPEND vga=791
+
+MENU SEPARATOR
+
+MENU BEGIN other
+       MENU TITLE Other installation options
+
+       LABEL other.back
+               MENU LABEL Back
+               MENU EXIT
+
+       MENU SEPARATOR
+
+       LABEL novga
+               MENU LABEL Install IPFire (text mode)
+               TEXT HELP
+Run the installer in text mode.
+               ENDTEXT
+               KERNEL vmlinuz
+               INITRD instroot
+
+       LABEL unattended
+               MENU LABEL Unattended installation
+               TEXT HELP
+Run an unattended installation.
+               ENDTEXT
+               KERNEL vmlinuz
+               INITRD instroot
+               APPEND unattended
+MENU END
+
+MENU BEGIN tools
+       MENU TITLE Tools
+
+       LABEL tools.back
+               MENU LABEL Back
+               MENU EXIT
+
+       MENU SEPARATOR
+
+       LABEL memtest
+               MENU LABEL memtest86+
+               TEXT HELP
+Diagnose memory problems with memtest86+.
+               ENDTEXT
+               KERNEL memtest
+
+       LABEL hdt
+               MENU LABEL Hardware Detection Tool
+               TEXT HELP
+Check your hardware with the Hardware Detection
+Tool!
+               ENDTEXT
+               KERNEL hdt.c32
+MENU END
+
+MENU SEPARATOR
+
+LABEL netboot
+       MENU LABEL boot.ipfire.org
+       TEXT HELP
+Boot from the IPFire Boot Server!
+       ENDTEXT
+       KERNEL netboot

diff --git a/langs/tr/install/lang_tr.c b/langs/tr/install/lang_tr.c
index 0dcedade39969925c28c4b1e3ce31ecff7e496c7..3a959b7ad8fdea9560d68b39bfca5d3b7e8d9d5c 100644 (file)
--- a/langs/tr/install/lang_tr.c
+++ b/langs/tr/install/lang_tr.c
@@ -90,7 +90,7 @@ char *tr_tr[] = {
 /* TR_CHOOSE_THE_ISDN_PROTOCOL */
 "İstediğiniz ISDN iletişim kuralını seçin.",
 /* TR_CONFIGURE_DHCP */
-"Ayar bilgilerini girerek DHCP sunucusu yapılandırın.",
+"DHCP ayar bilgilerini girerek DHCP sunucusunu yapılandırın.",
 /* TR_CONFIGURE_NETWORKING */
 "Ağ yapılandırması",
 /* TR_CONFIGURE_NETWORKING_LONG */
@@ -546,7 +546,7 @@ char *tr_tr[] = {
 /* TR_WARNING */
 "UYARI",
 /* TR_WARNING_LONG */
-"Bu IP adresini değiştiriseniz %s makinesi ile uzak oturum bağlantısı kopar ve yeniden IP girmeniz gerekir. Bu riskli bir işlemdir. Bu işlem sırasında bir şeyler ters giderse düzeltmek için makineye fiziksel erişimizin varsa denemelisiniz.",
+"Bu IP adresini değiştiriseniz %s makinesi ile uzak oturum bağlantısı kopar ve yeniden IP adresi girmeniz gerekir. Bu riskli bir işlemdir. Bu işlem sırasında bir şeyler ters giderse düzeltmek için makineye fiziksel erişiminiz varsa denemelisiniz.",
 /* TR_WELCOME */
 "%s kurulum programına hoş geldiniz. Sonraki ekranların herhangi birinde İptal seçeneğini seçtiğinizde bilgisayar yeniden başlatılacaktır.",
 /* TR_YOUR_CONFIGURATION_IS_SINGLE_GREEN_ALREADY_HAS_DRIVER */

diff --git a/lfs/cdrom b/lfs/cdrom
index 36dbe01e89b8b34820eeba5df11aa3a5ef929fce..48ac8918b60e4c9b4e17af1ba2fc3db4fb323dba 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -91,11 +91,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifneq "$(MACHINE_TYPE)" "arm"
        cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz
        cp /install/images/initrd                   /install/cdrom/boot/isolinux/instroot
-       cp $(DIR_SRC)/config/syslinux/syslinux.cfg  /install/cdrom/boot/isolinux/isolinux.cfg
-       cp $(DIR_SRC)/config/syslinux/boot.msg      /install/cdrom/boot/isolinux/boot.msg
-       cp $(DIR_SRC)/config/syslinux/splash.lss    /install/cdrom/boot/isolinux/splash.lss
+       cp $(DIR_SRC)/config/syslinux/boot.png      /install/cdrom/boot/isolinux/boot.png
        cp /usr/lib/memtest86+/memtest.bin          /install/cdrom/boot/isolinux/memtest
+       cp /usr/share/ipfire-netboot/ipxe.lkrn      /install/cdrom/boot/isolinux/netboot
        cp /usr/share/syslinux/isolinux.bin         /install/cdrom/boot/isolinux/isolinux.bin
+       cp /usr/share/hwdata/pci.ids                /install/cdrom/boot/isolinux/pci.ids
+       cp -vf /usr/share/syslinux/*.c32            /install/cdrom/boot/isolinux/
+       sed -e "s/VERSION/$(VERSION) - Core $(CORE)/g" \
+               $(DIR_SRC)/config/syslinux/syslinux.cfg \
+               > /install/cdrom/boot/isolinux/isolinux.cfg
 endif
        cd /install/cdrom && find -type f ! -name md5sum.txt | grep -v "./boot" | \
                                                xargs md5sum > md5sum.txt

diff --git a/lfs/ipfire-netboot b/lfs/ipfire-netboot
new file mode 100644 (file)
index 0000000..0590d9b
--- /dev/null
+++ b/lfs/ipfire-netboot
@@ -0,0 +1,88 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2013  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = v1.0
+PXE_VER    = c4bce43
+
+THISAPP    = ipfire-netboot-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = http://source.ipfire.org/releases/ipfire-netboot/
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE) ipxe-$(PXE_VER).tar.xz
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+ipxe-$(PXE_VER).tar.xz = $(URL_IPFIRE)/ipxe-$(PXE_VER).tar.xz
+
+$(DL_FILE)_MD5 = 257773a52ed5dda3053eb049bee38a60
+ipxe-$(PXE_VER).tar.xz_MD5 = 8aeb94330eb94f3f1e6170e23db0ba27
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+       # Extract iPXE source
+       cd $(DIR_APP) && tar axf $(DIR_DL)/ipxe-$(PXE_VER).tar.xz
+       cd $(DIR_APP) && rm -rfv ipxe && ln -s ipxe-$(PXE_VER) ipxe
+       cd $(DIR_APP) && make bin/ipxe.lkrn
+
+       # Installation
+       -mkdir -pv /usr/share/ipfire-netboot
+       cd $(DIR_APP) && install -m 644 bin/ipxe.lkrn /usr/share/ipfire-netboot
+
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/syslinux b/lfs/syslinux
index 43bcde9b628f071f6a87222cd58e177c2eae1442..7f7d9dfec7a8bf74ebd19be1e8facdc04fed6ede 100644 (file)
--- a/lfs/syslinux
+++ b/lfs/syslinux
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.06
+VER        = 5.01
 
 THISAPP    = syslinux-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 77d33140860621cd850c3a7ab0ebb7d6
+$(DL_FILE)_MD5 = 57489185863fd74be4e724ef9a2c422f
 
 install : $(TARGET)
 

diff --git a/make.sh b/make.sh
index 65244c04bde33bed35d86003b2d675b71c9ce1d8..3d4fe86eb7debb81675f29d75a5c29a331408c28 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -766,6 +766,7 @@ buildipfire() {
   ipfiremake sendEmail
   ipfiremake sysbench
   ipfiremake strace
+  ipfiremake ipfire-netboot
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild