[arch-releng] [RFC] [PATCH] [configs/releng] Converts relative to absolute paths inside syslinux*.cfg

Gerardo Exequiel Pozzi vmlinuz386 at yahoo.com.ar
Thu Nov 24 02:24:15 EST 2011 

* In this way we have unified directory scheme between pxelinux and {sys,ext,iso}linux
* Also enable IPAPPEND (will show a non-harm warning message under non-pxelinux bootloaders

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
---
 configs/releng/syslinux.dual/syslinux.cfg        |    6 +++---
 configs/releng/syslinux.dual/syslinux_32only.cfg |    6 +++---
 configs/releng/syslinux.dual/syslinux_arch32.cfg |    3 +--
 configs/releng/syslinux.dual/syslinux_arch64.cfg |    3 +--
 configs/releng/syslinux.dual/syslinux_both.cfg   |    8 ++++----
 configs/releng/syslinux.dual/syslinux_head.cfg   |    4 ++--
 configs/releng/syslinux.dual/syslinux_tail.cfg   |    8 ++++----
 configs/releng/syslinux/syslinux.cfg             |   17 ++++++++---------
 8 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/configs/releng/syslinux.dual/syslinux.cfg b/configs/releng/syslinux.dual/syslinux.cfg
index ac92998..ffc0b71 100644
--- a/configs/releng/syslinux.dual/syslinux.cfg
+++ b/configs/releng/syslinux.dual/syslinux.cfg
@@ -2,11 +2,11 @@ DEFAULT choose
 PROMPT 0
 
 LABEL choose
-KERNEL ifcpu64.c32
+KERNEL /%INSTALL_DIR%/boot/syslinux/ifcpu64.c32
 APPEND have64 -- nohave64
 
 LABEL have64
-CONFIG syslinux_both.cfg
+CONFIG /%INSTALL_DIR%/boot/syslinux/syslinux_both.cfg
 
 LABEL nohave64
-CONFIG syslinux_32only.cfg
+CONFIG /%INSTALL_DIR%/boot/syslinux/syslinux_32only.cfg
diff --git a/configs/releng/syslinux.dual/syslinux_32only.cfg b/configs/releng/syslinux.dual/syslinux_32only.cfg
index c7a452d..e320848 100644
--- a/configs/releng/syslinux.dual/syslinux_32only.cfg
+++ b/configs/releng/syslinux.dual/syslinux_32only.cfg
@@ -1,3 +1,3 @@
-INCLUDE syslinux_head.cfg
-INCLUDE syslinux_arch32.cfg
-INCLUDE syslinux_tail.cfg
+INCLUDE /%INSTALL_DIR%/boot/syslinux/syslinux_head.cfg
+INCLUDE /%INSTALL_DIR%/boot/syslinux/syslinux_arch32.cfg
+INCLUDE /%INSTALL_DIR%/boot/syslinux/syslinux_tail.cfg
diff --git a/configs/releng/syslinux.dual/syslinux_arch32.cfg b/configs/releng/syslinux.dual/syslinux_arch32.cfg
index 9b4030e..fa1bcdc 100644
--- a/configs/releng/syslinux.dual/syslinux_arch32.cfg
+++ b/configs/releng/syslinux.dual/syslinux_arch32.cfg
@@ -7,5 +7,4 @@ MENU LABEL Boot Arch Linux (i686)
 LINUX /%INSTALL_DIR%/boot/i686/vmlinuz
 INITRD /%INSTALL_DIR%/boot/i686/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
-# Next line should be uncommented when prepare enviroment to boot from PXE.
-#IPAPPEND 3
+IPAPPEND 3
diff --git a/configs/releng/syslinux.dual/syslinux_arch64.cfg b/configs/releng/syslinux.dual/syslinux_arch64.cfg
index 6cc644d..9a35c32 100644
--- a/configs/releng/syslinux.dual/syslinux_arch64.cfg
+++ b/configs/releng/syslinux.dual/syslinux_arch64.cfg
@@ -7,5 +7,4 @@ MENU LABEL Boot Arch Linux (x86_64)
 LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz
 INITRD /%INSTALL_DIR%/boot/x86_64/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
-# Next line should be uncommented when prepare enviroment to boot from PXE.
-#IPAPPEND 3
+IPAPPEND 3
diff --git a/configs/releng/syslinux.dual/syslinux_both.cfg b/configs/releng/syslinux.dual/syslinux_both.cfg
index 9cd1584..94fe516 100644
--- a/configs/releng/syslinux.dual/syslinux_both.cfg
+++ b/configs/releng/syslinux.dual/syslinux_both.cfg
@@ -1,4 +1,4 @@
-INCLUDE syslinux_head.cfg
-INCLUDE syslinux_arch32.cfg
-INCLUDE syslinux_arch64.cfg
-INCLUDE syslinux_tail.cfg
+INCLUDE /%INSTALL_DIR%/boot/syslinux/syslinux_head.cfg
+INCLUDE /%INSTALL_DIR%/boot/syslinux/syslinux_arch32.cfg
+INCLUDE /%INSTALL_DIR%/boot/syslinux/syslinux_arch64.cfg
+INCLUDE /%INSTALL_DIR%/boot/syslinux/syslinux_tail.cfg
diff --git a/configs/releng/syslinux.dual/syslinux_head.cfg b/configs/releng/syslinux.dual/syslinux_head.cfg
index f46ba78..b49f2bc 100644
--- a/configs/releng/syslinux.dual/syslinux_head.cfg
+++ b/configs/releng/syslinux.dual/syslinux_head.cfg
@@ -1,8 +1,8 @@
 SERIAL 0 38400
-DEFAULT vesamenu.c32
+DEFAULT /%INSTALL_DIR%/boot/syslinux/vesamenu.c32
 PROMPT 0
 MENU TITLE Arch Linux
-MENU BACKGROUND splash.png
+MENU BACKGROUND /%INSTALL_DIR%/boot/syslinux/splash.png
 TIMEOUT 3000
 
 MENU WIDTH 78
diff --git a/configs/releng/syslinux.dual/syslinux_tail.cfg b/configs/releng/syslinux.dual/syslinux_tail.cfg
index 7dd1270..822c679 100644
--- a/configs/releng/syslinux.dual/syslinux_tail.cfg
+++ b/configs/releng/syslinux.dual/syslinux_tail.cfg
@@ -4,7 +4,7 @@ Boot an existing operating system. Press TAB to edit the disk and partition
 number to boot.
 ENDTEXT
 MENU LABEL Boot existing OS
-COM32 chain.c32
+COM32 /%INSTALL_DIR%/boot/syslinux/chain.c32
 APPEND hd0 0
 
 # http://www.memtest.org/
@@ -16,14 +16,14 @@ LINUX /%INSTALL_DIR%/boot/memtest
 LABEL hdt
 MENU LABEL Hardware Information (HDT)
 COM32 hdt.c32
-APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz
+APPEND modules_alias=/%INSTALL_DIR%/boot/syslinux/hdt/modalias.gz pciids=/%INSTALL_DIR%/boot/syslinux/hdt/pciids.gz
 
 LABEL reboot
 MENU LABEL Reboot
-COM32 reboot.c32
+COM32 /%INSTALL_DIR%/boot/syslinux/reboot.c32
 
 LABEL poweroff
 MENU LABEL Power Off
-COMBOOT poweroff.com
+COMBOOT /%INSTALL_DIR%/boot/syslinux/poweroff.com
 
 ONTIMEOUT arch32
diff --git a/configs/releng/syslinux/syslinux.cfg b/configs/releng/syslinux/syslinux.cfg
index 7762278..f102ee4 100644
--- a/configs/releng/syslinux/syslinux.cfg
+++ b/configs/releng/syslinux/syslinux.cfg
@@ -1,8 +1,8 @@
 SERIAL 0 38400
-DEFAULT vesamenu.c32
+DEFAULT /%INSTALL_DIR%/boot/syslinux/vesamenu.c32
 PROMPT 0
 MENU TITLE Arch Linux
-MENU BACKGROUND splash.png
+MENU BACKGROUND /%INSTALL_DIR%/boot/syslinux/splash.png
 TIMEOUT 3000
 
 MENU WIDTH 78
@@ -36,8 +36,7 @@ MENU LABEL Boot Arch Linux
 LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz
 INITRD /%INSTALL_DIR%/boot/%ARCH%/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
-# Next line should be uncommented when prepare enviroment to boot from PXE.
-#IPAPPEND 3
+IPAPPEND 3
 
 LABEL existing
 TEXT HELP
@@ -45,7 +44,7 @@ Boot an existing operating system. Press TAB to edit the disk and partition
 number to boot.
 ENDTEXT
 MENU LABEL Boot existing OS
-COM32 chain.c32
+COM32 /%INSTALL_DIR%/boot/syslinux/chain.c32
 APPEND hd0 0
 
 # http://www.memtest.org/
@@ -56,15 +55,15 @@ LINUX /%INSTALL_DIR%/boot/memtest
 # http://hdt-project.org/
 LABEL hdt
 MENU LABEL Hardware Information (HDT)
-COM32 hdt.c32
-APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz
+COM32 /%INSTALL_DIR%/boot/syslinux/hdt.c32
+APPEND modules_alias=/%INSTALL_DIR%/boot/syslinux/hdt/modalias.gz pciids=/%INSTALL_DIR%/boot/syslinux/hdt/pciids.gz
 
 LABEL reboot
 MENU LABEL Reboot
-COM32 reboot.c32
+COM32 /%INSTALL_DIR%/boot/syslinux/reboot.c32
 
 LABEL poweroff
 MENU LABEL Power Off
-COMBOOT poweroff.com
+COMBOOT /%INSTALL_DIR%/boot/syslinux/poweroff.com
 
 ONTIMEOUT arch
-- 
1.7.7.4

More information about the arch-releng mailing list