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/baseline/syslinux/syslinux.cfg | |
| 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/baseline/syslinux/syslinux.cfg')
| -rw-r--r-- | configs/baseline/syslinux/syslinux.cfg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg index 58c3209..6bd59a5 100644 --- a/configs/baseline/syslinux/syslinux.cfg +++ b/configs/baseline/syslinux/syslinux.cfg @@ -5,7 +5,7 @@ TIMEOUT 300 LABEL libre MENU LABEL Parabola GNU/Linux-libre -LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz26 +LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz INITRD /%INSTALL_DIR%/boot/%ARCH%/libreiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% |