summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorDrtan Samos <lashdu@drtan.twilightparadox.com>2013-12-27 21:35:30 +0100
committerThe Mighty Gravi <themightygravi@inventati.org>2014-10-08 13:37:23 +0000
commitb9117b2a8cb3b15e056b15ac431a6082f8729048 (patch)
tree8563c02b403fced82bd5ce21f9e189db957b7cbf /configs
parent242e28baba897dfe2979c1524627ead4282fb1b2 (diff)
The latest version of syslinux.
Diffstat (limited to 'configs')
-rwxr-xr-xconfigs/profile/build.sh12
-rw-r--r--configs/profile/isolinux/isolinux.cfg1
-rw-r--r--configs/profile/syslinux/parabolaiso_pxe32.cfg6
-rw-r--r--configs/profile/syslinux/parabolaiso_pxe64.cfg6
-rw-r--r--configs/profile/syslinux/parabolaiso_tail.cfg2
5 files changed, 14 insertions, 13 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index b2febb1..8bb8dd6 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -105,10 +105,9 @@ make_syslinux() {
s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}
done
cp ${data_dir}/splash.png ${work_dir}/iso/${install_dir}/boot/syslinux
- cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/*.c32 ${work_dir}/iso/${install_dir}/boot/syslinux
- cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/*.com ${work_dir}/iso/${install_dir}/boot/syslinux
- cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/*.0 ${work_dir}/iso/${install_dir}/boot/syslinux
- cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/memdisk ${work_dir}/iso/${install_dir}/boot/syslinux
+ cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/*.c32 ${work_dir}/iso/${install_dir}/boot/syslinux
+ cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/lpxelinux.0 ${work_dir}/iso/${install_dir}/boot/syslinux
+ cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/memdisk ${work_dir}/iso/${install_dir}/boot/syslinux
mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux/hdt
gzip -c -9 ${work_dir}/${arch}/root-image/usr/share/hwdata/pci.ids > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz
gzip -c -9 ${work_dir}/${arch}/root-image/usr/lib/modules/*-LIBRE/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz
@@ -118,8 +117,9 @@ make_syslinux() {
make_isolinux() {
mkdir -p ${work_dir}/iso/isolinux
sed "s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/isolinux/isolinux.cfg > ${work_dir}/iso/isolinux/isolinux.cfg
- cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/isolinux.bin ${work_dir}/iso/isolinux/
- cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/isohdpfx.bin ${work_dir}/iso/isolinux/
+ cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/
+ cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/
+ cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/
}
# Prepare /EFI
diff --git a/configs/profile/isolinux/isolinux.cfg b/configs/profile/isolinux/isolinux.cfg
index 3ee24e0..10472fb 100644
--- a/configs/profile/isolinux/isolinux.cfg
+++ b/configs/profile/isolinux/isolinux.cfg
@@ -1,3 +1,4 @@
+PATH /%INSTALL_DIR%/boot/syslinux/
DEFAULT loadconfig
LABEL loadconfig
diff --git a/configs/profile/syslinux/parabolaiso_pxe32.cfg b/configs/profile/syslinux/parabolaiso_pxe32.cfg
index 60bc713..9df86b7 100644
--- a/configs/profile/syslinux/parabolaiso_pxe32.cfg
+++ b/configs/profile/syslinux/parabolaiso_pxe32.cfg
@@ -7,7 +7,7 @@ MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NBD)
LINUX boot/i686/vmlinuz
INITRD boot/i686/parabolaiso.img
APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver}
-IPAPPEND 3
+SYSAPPEND 3
LABEL parabola32_nfs
TEXT HELP
@@ -18,7 +18,7 @@ MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NFS)
LINUX boot/i686/vmlinuz
INITRD boot/i686/parabolaiso.img
APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt
-IPAPPEND 3
+SYSAPPEND 3
LABEL parabola32_http
TEXT HELP
@@ -29,4 +29,4 @@ MENU LABEL Boot Parabola GNU/Linux-libre (i686) (HTTP)
LINUX boot/i686/vmlinuz
INITRD boot/i686/parabolaiso.img
APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/
-IPAPPEND 3
+SYSAPPEND 3
diff --git a/configs/profile/syslinux/parabolaiso_pxe64.cfg b/configs/profile/syslinux/parabolaiso_pxe64.cfg
index 34bf7d7..be3e3de 100644
--- a/configs/profile/syslinux/parabolaiso_pxe64.cfg
+++ b/configs/profile/syslinux/parabolaiso_pxe64.cfg
@@ -7,7 +7,7 @@ MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NBD)
LINUX boot/x86_64/vmlinuz
INITRD boot/x86_64/parabolaiso.img
APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver}
-IPAPPEND 3
+SYSAPPEND 3
LABEL parabola64_nfs
TEXT HELP
@@ -18,7 +18,7 @@ MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NFS)
LINUX boot/x86_64/vmlinuz
INITRD boot/x86_64/parabolaiso.img
APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_nfs_srv=${pxeserver}:/run/parabolaiso/bootmnt
-IPAPPEND 3
+SYSAPPEND 3
LABEL parabola64_http
TEXT HELP
@@ -29,4 +29,4 @@ MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (HTTP)
LINUX boot/x86_64/vmlinuz
INITRD boot/x86_64/parabolaiso.img
APPEND parabolaisobasedir=%INSTALL_DIR% parabolaiso_http_srv=http://${pxeserver}/
-IPAPPEND 3
+SYSAPPEND 3
diff --git a/configs/profile/syslinux/parabolaiso_tail.cfg b/configs/profile/syslinux/parabolaiso_tail.cfg
index 5d95b3b..e85d8e1 100644
--- a/configs/profile/syslinux/parabolaiso_tail.cfg
+++ b/configs/profile/syslinux/parabolaiso_tail.cfg
@@ -24,4 +24,4 @@ COM32 boot/syslinux/reboot.c32
LABEL poweroff
MENU LABEL Power Off
-COMBOOT boot/syslinux/poweroff.com
+COM32 boot/syslinux/poweroff.c32