diff options
| author | Thomas Bächler <thomas@archlinux.org> | 2010-10-17 19:03:21 +0200 |
|---|---|---|
| committer | Thomas Bächler <thomas@archlinux.org> | 2010-10-17 19:03:21 +0200 |
| commit | 3d30349dee4f30d542385f92eecdfc1c3b20036a (patch) | |
| tree | c788030f203499d57c6db6d1abc3e498a6c8e540 | |
| parent | 21595371bb747108725ae55bfec85e001be46e49 (diff) | |
| download | archiso32-3d30349dee4f30d542385f92eecdfc1c3b20036a.tar.xz | |
Remove occurrences of KERNEL from syslinux.cfg
syslinux's KERNEL command tries to autodetect the type of the kernel
by looking at the file's extension. This is unsafe, use the explicit
versions instead:
LINUX - for Linux kernels (memtest is booted like a Linux kernel, too)
COM32 - for COM32 modules
COMBOOT - for comboot modules (only poweroff.com right now)
See http://syslinux.zytor.com/wiki/index.php/SYSLINUX#KERNEL_file
| -rw-r--r-- | archiso2dual/syslinux.cfg | 14 | ||||
| -rw-r--r-- | configs/syslinux-iso/boot-files/syslinux/syslinux.cfg | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/archiso2dual/syslinux.cfg b/archiso2dual/syslinux.cfg index e7f9bf6..b53b883 100644 --- a/archiso2dual/syslinux.cfg +++ b/archiso2dual/syslinux.cfg @@ -37,7 +37,7 @@ Boot the Arch Linux (i686) live medium. It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (i686) -KERNEL /boot/i686/vmlinuz26 +LINUX /boot/i686/vmlinuz26 APPEND initrd=/boot/i686/archiso.img archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 # Next line should be uncommented when prepare enviroment to boot from PXE. #IPAPPEND 3 @@ -48,7 +48,7 @@ Boot the Arch Linux (x86_64) live medium. It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (x86_64) -KERNEL /boot/x86_64/vmlinuz26 +LINUX /boot/x86_64/vmlinuz26 APPEND initrd=/boot/x86_64/archiso.img archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 # Next line should be uncommented when prepare enviroment to boot from PXE. #IPAPPEND 3 @@ -59,26 +59,26 @@ Boot an existing operating system. Press TAB to edit the disk and partition number to boot. ENDTEXT MENU LABEL Boot existing OS -KERNEL chain.c32 +COM32 chain.c32 APPEND hd0 0 # http://www.memtest.org/ LABEL memtest MENU LABEL Run Memtest86+ (RAM test) -KERNEL /boot/memtest +LINUX /boot/memtest # http://hdt-project.org/ LABEL hdt MENU LABEL Hardware Information (HDT) -KERNEL hdt.c32 +COM32 hdt.c32 APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz LABEL reboot MENU LABEL Reboot -KERNEL reboot.c32 +COM32 reboot.c32 LABEL poweroff MENU LABEL Power Off -KERNEL poweroff.com +COMBOOT poweroff.com ONTIMEOUT arch32 diff --git a/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg b/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg index 0760e2e..15a9fd7 100644 --- a/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg +++ b/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg @@ -37,7 +37,7 @@ Boot the Arch Linux live medium. It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux -KERNEL /boot/vmlinuz26 +LINUX /boot/vmlinuz26 APPEND initrd=/boot/archiso.img archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 # Next line should be uncommented when prepare enviroment to boot from PXE. #IPAPPEND 3 @@ -48,26 +48,26 @@ Boot an existing operating system. Press TAB to edit the disk and partition number to boot. ENDTEXT MENU LABEL Boot existing OS -KERNEL chain.c32 +COM32 chain.c32 APPEND hd0 0 # http://www.memtest.org/ LABEL memtest MENU LABEL Run Memtest86+ (RAM test) -KERNEL /boot/memtest +LINUX /boot/memtest # http://hdt-project.org/ LABEL hdt MENU LABEL Hardware Information (HDT) -KERNEL hdt.c32 +COM32 hdt.c32 APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz LABEL reboot MENU LABEL Reboot -KERNEL reboot.c32 +COM32 reboot.c32 LABEL poweroff MENU LABEL Power Off -KERNEL poweroff.com +COMBOOT poweroff.com ONTIMEOUT arch |