webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

syslinux: Update to 5.01 + new menu.

Browse Source 
Some people reported problems that the CD image won't boot
on certain hardware.

As there have been more changes on isolinux, this patch replaces
the old text prompt with a nice menu in graphical mode.
This commit is contained in:
Michael Tremer
2013-05-22 14:28:39 +02:00
parent 4987c2b7fe
commit df2ac65557
7 changed files with 96 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
config/rootfiles/common/i586/syslinux
View File

@@ -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

8
config/syslinux/boot.msg
View File

@@ -1,8 +0,0 @@
splash.lss
- To install IPFire on your system, press the 04<ENTER>07 key.
- To disable vga mode, type: 04novga <ENTER>07.
- To test the memory in your system type: 04memtest <ENTER>07.

BIN
config/syslinux/boot.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 158 KiB

BIN
config/syslinux/splash.lss
View File

Binary file not shown.

87
config/syslinux/syslinux.cfg
View File

@@ -1,17 +1,70 @@
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 60
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
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)
KERNEL vmlinuz
INITRD instroot
LABEL unattended
MENU LABEL Unattended installation
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+
KERNEL memtest
LABEL hdt
MENU LABEL Hardware Detection Tool
KERNEL hdt.c32
MENU END

9
lfs/cdrom
View File

@@ -91,11 +91,14 @@ $(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/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

4
lfs/syslinux
View File

@@ -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)