diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-08-17 12:26:22 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-08-17 12:26:22 -0300 |
| commit | be5fc1d5c788df0f2d8d050e97581977caf133a3 (patch) | |
| tree | 39f6c577dbad42bbd5efc5eae6a4f316e476f3c1 /configs/releng/syslinux.dual | |
| parent | acdae85c827f2a6349397740c9e3ed2ded82cb07 (diff) | |
| parent | 708ba38c206a2147fbd7a357d6ece8881807231d (diff) | |
Merge branch 'master' of https://projects.archlinux.org/git/archiso
Conflicts:
configs/baseline/build.sh
configs/baseline/syslinux/syslinux.cfg
configs/releng/build.sh
configs/releng/syslinux.dual/syslinux_arch32.cfg
configs/releng/syslinux.dual/syslinux_arch64.cfg
configs/releng/syslinux/syslinux.cfg
Diffstat (limited to 'configs/releng/syslinux.dual')
| -rw-r--r-- | configs/releng/syslinux.dual/syslinux_arch32.cfg | 2 | ||||
| -rw-r--r-- | configs/releng/syslinux.dual/syslinux_arch64.cfg | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configs/releng/syslinux.dual/syslinux_arch32.cfg b/configs/releng/syslinux.dual/syslinux_arch32.cfg index e2575ae..d6180f6 100644 --- a/configs/releng/syslinux.dual/syslinux_arch32.cfg +++ b/configs/releng/syslinux.dual/syslinux_arch32.cfg @@ -4,7 +4,7 @@ Boot the Parabola (i686) live medium. It allows you to install a fully libre Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola (i686) -LINUX /%INSTALL_DIR%/boot/i686/vmlinuz26 +LINUX /%INSTALL_DIR%/boot/i686/vmlinuz INITRD /%INSTALL_DIR%/boot/i686/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% # Next line should be uncommented when prepare enviroment to boot from PXE. diff --git a/configs/releng/syslinux.dual/syslinux_arch64.cfg b/configs/releng/syslinux.dual/syslinux_arch64.cfg index e38e984..64f2269 100644 --- a/configs/releng/syslinux.dual/syslinux_arch64.cfg +++ b/configs/releng/syslinux.dual/syslinux_arch64.cfg @@ -4,7 +4,7 @@ Boot the Parabola (x86_64) live medium. It allows you to install a fully libre Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot Parabola (x86_64) -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz26 +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz INITRD /%INSTALL_DIR%/boot/x86_64/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% # Next line should be uncommented when prepare enviroment to boot from PXE. |