summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigs/baseline/build.sh2
-rw-r--r--configs/baseline/syslinux/syslinux.cfg2
-rwxr-xr-xconfigs/releng/build.sh8
-rw-r--r--configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf2
-rw-r--r--configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf2
-rw-r--r--configs/releng/syslinux/archiso_pxe32.cfg2
-rw-r--r--configs/releng/syslinux/archiso_pxe64.cfg2
-rw-r--r--configs/releng/syslinux/archiso_sys32.cfg2
-rw-r--r--configs/releng/syslinux/archiso_sys64.cfg2
9 files changed, 12 insertions, 12 deletions
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index faef37d..c215bdb 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -43,7 +43,7 @@ make_boot() {
# Prepare /${install_dir}/boot/syslinux
make_syslinux() {
mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux
- sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+ sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g;
s|%ARCH%|${arch}|g" ${script_path}/syslinux/syslinux.cfg > ${work_dir}/iso/${install_dir}/boot/syslinux/syslinux.cfg
cp ${work_dir}/root-image/usr/lib/syslinux/menu.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/
diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg
index 6ddccc0..bbb3a84 100644
--- a/configs/baseline/syslinux/syslinux.cfg
+++ b/configs/baseline/syslinux/syslinux.cfg
@@ -5,4 +5,4 @@ LABEL arch
MENU LABEL Parabola GNU/Linux-libre
LINUX boot/%ARCH%/vmlinuz
INITRD boot/%ARCH%/parabolaiso.img
-APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%ARCHISO_LABEL%
+APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 45ee5cc..9c5982a 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -105,7 +105,7 @@ make_boot_extra() {
make_syslinux() {
mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux
for _cfg in ${script_path}/syslinux/*.cfg; do
- sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+ sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}
done
cp ${script_path}/syslinux/splash.png ${work_dir}/iso/${install_dir}/boot/syslinux
@@ -136,7 +136,7 @@ make_efi() {
cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/iso/loader/entries/
cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/iso/loader/entries/
- sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+ sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g" \
${script_path}/efiboot/loader/entries/parabolaiso-x86_64-usb.conf > ${work_dir}/iso/loader/entries/parabolaiso-x86_64.conf
@@ -150,7 +150,7 @@ make_efi() {
make_efiboot() {
mkdir -p ${work_dir}/iso/EFI/parabolaiso
truncate -s 31M ${work_dir}/iso/EFI/parabolaiso/efiboot.img
- mkfs.vfat -n ARCHISO_EFI ${work_dir}/iso/EFI/parabolaiso/efiboot.img
+ mkfs.vfat -n PARABOLAISO_EFI ${work_dir}/iso/EFI/parabolaiso/efiboot.img
mkdir -p ${work_dir}/efiboot
mount ${work_dir}/iso/EFI/parabolaiso/efiboot.img ${work_dir}/efiboot
@@ -167,7 +167,7 @@ make_efiboot() {
cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/efiboot/loader/entries/
cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/efiboot/loader/entries/
- sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+ sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g" \
${script_path}/efiboot/loader/entries/parabolaiso-x86_64-cd.conf > ${work_dir}/efiboot/loader/entries/parabolaiso-x86_64.conf
diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
index fba03d5..057e14f 100644
--- a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
+++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
@@ -1,4 +1,4 @@
title Parabola GNU/Linux-libre parabolaiso x86_64 UEFI CD
linux /EFI/parabolaiso/vmlinuz.efi
initrd /EFI/parabolaiso/parabolaiso.img
-options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%ARCHISO_LABEL%
+options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%
diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
index 6b87475..3863799 100644
--- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
+++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
@@ -1,4 +1,4 @@
title Parabola GNU/Linux-libre parabolaiso x86_64 UEFI USB
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz
initrd /%INSTALL_DIR%/boot/x86_64/parabolaiso.img
-options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%ARCHISO_LABEL%
+options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%
diff --git a/configs/releng/syslinux/archiso_pxe32.cfg b/configs/releng/syslinux/archiso_pxe32.cfg
index b3ec7cc..4211fe4 100644
--- a/configs/releng/syslinux/archiso_pxe32.cfg
+++ b/configs/releng/syslinux/archiso_pxe32.cfg
@@ -6,7 +6,7 @@ ENDTEXT
MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NBD)
LINUX boot/i686/vmlinuz
INITRD boot/i686/parabolaiso.img
-APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%ARCHISO_LABEL% parabolaiso_nbd_srv=${pxeserver}
+APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver}
IPAPPEND 3
LABEL arch32_nfs
diff --git a/configs/releng/syslinux/archiso_pxe64.cfg b/configs/releng/syslinux/archiso_pxe64.cfg
index 64d801f..fedbe45 100644
--- a/configs/releng/syslinux/archiso_pxe64.cfg
+++ b/configs/releng/syslinux/archiso_pxe64.cfg
@@ -6,7 +6,7 @@ ENDTEXT
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=%ARCHISO_LABEL% parabolaiso_nbd_srv=${pxeserver}
+APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% parabolaiso_nbd_srv=${pxeserver}
IPAPPEND 3
LABEL arch64_nfs
diff --git a/configs/releng/syslinux/archiso_sys32.cfg b/configs/releng/syslinux/archiso_sys32.cfg
index a104149..a88f796 100644
--- a/configs/releng/syslinux/archiso_sys32.cfg
+++ b/configs/releng/syslinux/archiso_sys32.cfg
@@ -6,4 +6,4 @@ ENDTEXT
MENU LABEL Boot Parabola GNU/Linux-libre (i686)
LINUX boot/i686/vmlinuz
INITRD boot/i686/parabolaiso.img
-APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%ARCHISO_LABEL%
+APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%
diff --git a/configs/releng/syslinux/archiso_sys64.cfg b/configs/releng/syslinux/archiso_sys64.cfg
index f3df01e..9d87c0e 100644
--- a/configs/releng/syslinux/archiso_sys64.cfg
+++ b/configs/releng/syslinux/archiso_sys64.cfg
@@ -6,4 +6,4 @@ ENDTEXT
MENU LABEL Boot Parabola GNU/Linux-libre (x86_64)
LINUX boot/x86_64/vmlinuz
INITRD boot/x86_64/parabolaiso.img
-APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%ARCHISO_LABEL%
+APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%