[arch-releng] [PATCH] syslinux*.cfg: Use INITRD statement instead of initrd= on the APPEND line.
Thomas Bächler
thomas at archlinux.org
Mon Feb 28 11:25:37 EST 2011
This newer format improves configuration file readability.
---
archiso2dual/syslinux_arch32.cfg | 3 ++-
archiso2dual/syslinux_arch64.cfg | 3 ++-
.../syslinux-iso/boot-files/syslinux/syslinux.cfg | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/archiso2dual/syslinux_arch32.cfg b/archiso2dual/syslinux_arch32.cfg
index f912874..ad3c1b4 100644
--- a/archiso2dual/syslinux_arch32.cfg
+++ b/archiso2dual/syslinux_arch32.cfg
@@ -5,6 +5,7 @@ perform system maintenance.
ENDTEXT
MENU LABEL Boot Arch Linux (i686)
LINUX /%INSTALL_DIR%/boot/i686/vmlinuz26
-APPEND initrd=/%INSTALL_DIR%/boot/i686/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=75% locale=en_US.UTF-8
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=75% locale=en_US.UTF-8
+INITRD /%INSTALL_DIR%/boot/i686/archiso.img
# Next line should be uncommented when prepare enviroment to boot from PXE.
#IPAPPEND 3
diff --git a/archiso2dual/syslinux_arch64.cfg b/archiso2dual/syslinux_arch64.cfg
index 10786cd..5aa6f99 100644
--- a/archiso2dual/syslinux_arch64.cfg
+++ b/archiso2dual/syslinux_arch64.cfg
@@ -5,6 +5,7 @@ perform system maintenance.
ENDTEXT
MENU LABEL Boot Arch Linux (x86_64)
LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz26
-APPEND initrd=/%INSTALL_DIR%/boot/x86_64/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=75% locale=en_US.UTF-8
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=75% locale=en_US.UTF-8
+INITRD /%INSTALL_DIR%/boot/x86_64/archiso.img
# Next line should be uncommented when prepare enviroment to boot from PXE.
#IPAPPEND 3
diff --git a/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg b/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg
index 9b25021..02c1b3d 100644
--- a/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg
+++ b/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg
@@ -38,7 +38,8 @@ perform system maintenance.
ENDTEXT
MENU LABEL Boot Arch Linux
LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz26
-APPEND initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=75% locale=en_US.UTF-8
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% rw_branch_size=75% locale=en_US.UTF-8
+INITRD /%INSTALL_DIR%/boot/%ARCH%/archiso.img
# Next line should be uncommented when prepare enviroment to boot from PXE.
#IPAPPEND 3
--
1.7.4.1
More information about the arch-releng
mailing list