summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
Diffstat (limited to 'configs')
-rwxr-xr-xconfigs/baseline/build.sh113
-rw-r--r--configs/baseline/packages.x86_64 (renamed from configs/baseline/packages.both)0
-rw-r--r--configs/baseline/profiledef.sh12
-rwxr-xr-xconfigs/lxde-openrc/airootfs/root/customize_airootfs.sh2
-rwxr-xr-xconfigs/lxde-openrc/build.sh309
-rw-r--r--configs/lxde-openrc/profiledef.sh12
-rw-r--r--configs/lxde-openrc/syslinux/parabolaiso_sys32.cfg2
-rwxr-xr-xconfigs/releng-openrc/airootfs/root/customize_airootfs.sh2
-rwxr-xr-xconfigs/releng-openrc/build.sh309
-rw-r--r--configs/releng-openrc/profiledef.sh12
-rw-r--r--configs/releng-openrc/syslinux/parabolaiso_sys32.cfg2
-rwxr-xr-xconfigs/releng/airootfs/root/customize_airootfs.sh2
-rwxr-xr-xconfigs/releng/build.sh307
-rw-r--r--configs/releng/profiledef.sh12
-rw-r--r--configs/releng/syslinux/parabolaiso_sys32.cfg2
-rwxr-xr-xconfigs/talkingparabola/airootfs/root/customize_airootfs.sh2
-rwxr-xr-xconfigs/talkingparabola/build.sh307
-rw-r--r--configs/talkingparabola/profiledef.sh12
-rw-r--r--configs/talkingparabola/syslinux/parabolaiso_sys32.cfg2
19 files changed, 93 insertions, 1328 deletions
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index fce82fb..9a9f654 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -2,113 +2,6 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
-set -e -u
-
-iso_name=parabola
-iso_label="PARA_$(date +%Y%m)"
-iso_version=$(date +%Y.%m.%d)
-install_dir=parabola
-arch=$(uname -m)
-work_dir=work
-out_dir=out
-
-script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && pwd )"
-
-umask 0022
-
-# Helper function to run make_*() only one time per architecture.
-run_once() {
- if [[ ! -e "${work_dir}/build.${1}_${arch}" ]]; then
- "$1"
- touch "${work_dir}/build.${1}_${arch}"
- fi
-}
-
-# Setup custom pacman.conf with current cache directories.
-make_pacman_conf() {
- local _cache_dirs
- _cache_dirs=("$(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')")
- sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n "${_cache_dirs[@]}")|g" \
- "${script_path}/pacman.conf" > "${work_dir}/pacman.conf"
-}
-
-# Prepare working directory and copy custom airootfs files (airootfs)
-make_custom_airootfs() {
- local _airootfs="${work_dir}/airootfs"
- mkdir -p -- "${_airootfs}"
-
- if [[ -d "${script_path}/airootfs" ]]; then
- cp -af --no-preserve=ownership -- "${script_path}/airootfs/." "${_airootfs}"
- [[ -e "${_airootfs}/etc/shadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/shadow"
- [[ -e "${_airootfs}/etc/gshadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/gshadow"
-
- # Set up user home directories and permissions
- if [[ -e "${_airootfs}/etc/passwd" ]]; then
- while IFS=':' read -a passwd -r; do
- [[ "${passwd[5]}" == '/' ]] && continue
-
- if [[ -d "${_airootfs}${passwd[5]}" ]]; then
- chown -hR -- "${passwd[2]}:${passwd[3]}" "${_airootfs}${passwd[5]}"
- chmod -f 0750 -- "${_airootfs}${passwd[5]}"
- else
- install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${_airootfs}${passwd[5]}"
- fi
- done < "${_airootfs}/etc/passwd"
- fi
- fi
-}
-
-# Packages (airootfs)
-make_packages() {
- mkparabolaiso -v -w "${work_dir}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}/packages.both"| sed ':a;N;$!ba;s/\n/ /g')" install
-}
-
-# Prepare ${install_dir}/boot/
-make_boot() {
- mkdir -p "${work_dir}/iso/${install_dir}/boot/${arch}"
- cp "${work_dir}/airootfs/boot/parabolaiso.img" "${work_dir}/iso/${install_dir}/boot/${arch}/parabolaiso.img"
- cp "${work_dir}/airootfs/boot/vmlinuz-linux-libre" "${work_dir}/iso/${install_dir}/boot/${arch}/"
-}
-
-# Prepare /${install_dir}/boot/syslinux
-make_syslinux() {
- mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux"
- 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}/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/${install_dir}/boot/syslinux/"
- cp "${work_dir}/airootfs/usr/lib/syslinux/bios/menu.c32" "${work_dir}/iso/${install_dir}/boot/syslinux/"
- cp "${work_dir}/airootfs/usr/lib/syslinux/bios/libutil.c32" "${work_dir}/iso/${install_dir}/boot/syslinux/"
-}
-
-# Prepare /isolinux
-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}/airootfs/usr/lib/syslinux/bios/isolinux.bin" "${work_dir}/iso/isolinux/"
- cp "${work_dir}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin" "${work_dir}/iso/isolinux/"
- cp "${work_dir}/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/isolinux/"
-}
-
-# Build airootfs filesystem image
-make_prepare() {
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" prepare
-}
-
-# Build ISO
-make_iso() {
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso \
- "${iso_name}-${iso_version}-${arch}.iso"
-}
-
-run_once make_custom_airootfs
-run_once make_pacman_conf
-run_once make_packages
-run_once make_boot
-run_once make_syslinux
-run_once make_isolinux
-run_once make_prepare
-run_once make_iso
+printf '\n[%s] WARNING: %s\n\n' "mkparabolaiso" "build.sh scripts are deprecated! Please use mkparabolaiso directly." >&2
+_buildsh_path="$(realpath -- "$0")"
+exec mkparabolaiso "$@" -B "${_buildsh_path%/*}" build_profile
diff --git a/configs/baseline/packages.both b/configs/baseline/packages.x86_64
index 62a9103..62a9103 100644
--- a/configs/baseline/packages.both
+++ b/configs/baseline/packages.x86_64
diff --git a/configs/baseline/profiledef.sh b/configs/baseline/profiledef.sh
new file mode 100644
index 0000000..4a05474
--- /dev/null
+++ b/configs/baseline/profiledef.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2034
+
+iso_name="parabola-baseline"
+iso_label="PARA_$(date +%Y%m)"
+iso_publisher="Parabola GNU/Linux-libre <https://www.parabola.nu>"
+iso_application="Parabola GNU/Linux-libre baseline"
+iso_version="$(date +%Y.%m.%d)"
+install_dir="parabola"
+bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito')
+arch="x86_64"
+pacman_conf="pacman.conf"
diff --git a/configs/lxde-openrc/airootfs/root/customize_airootfs.sh b/configs/lxde-openrc/airootfs/root/customize_airootfs.sh
index ee8fb9b..05001d9 100755
--- a/configs/lxde-openrc/airootfs/root/customize_airootfs.sh
+++ b/configs/lxde-openrc/airootfs/root/customize_airootfs.sh
@@ -4,7 +4,7 @@
set -e -u
-echo 'Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future parabolaiso version.'
+# Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future parabolaiso version.
sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
sed -i 's/#\(es_ES\.UTF-8\)/\1/' /etc/locale.gen
diff --git a/configs/lxde-openrc/build.sh b/configs/lxde-openrc/build.sh
index 58f8a84..9a9f654 100755
--- a/configs/lxde-openrc/build.sh
+++ b/configs/lxde-openrc/build.sh
@@ -1,304 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
-set -e -u
-
-iso_name=parabola-openrc-lxde
-iso_label="PARA_$(date +%Y%m)"
-iso_publisher="Parabola GNU/Linux-libre <http://www.parabola.nu>"
-iso_application="Parabola GNU/Linux-libre Live/Rescue CD"
-iso_version=$(date +%Y.%m.%d)
-install_dir=parabola
-work_dir=work
-out_dir=out
-gpg_key=""
-
-arch=$(uname -m)
-verbose=""
-script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && pwd )"
-
-export arch
-umask 0022
-
-_usage ()
-{
- echo "usage ${0} [options]"
- echo
- echo " General options:"
- echo " -N <iso_name> Set an iso filename (prefix)"
- echo " Default: ${iso_name}"
- echo " -V <iso_version> Set an iso version (in filename)"
- echo " Default: ${iso_version}"
- echo " -L <iso_label> Set an iso label (disk label)"
- echo " Default: ${iso_label}"
- echo " -P <publisher> Set a publisher for the disk"
- echo " Default: '${iso_publisher}'"
- echo " -A <application> Set an application name for the disk"
- echo " Default: '${iso_application}'"
- echo " -D <install_dir> Set an install_dir (directory inside iso)"
- echo " Default: ${install_dir}"
- echo " -w <work_dir> Set the working directory"
- echo " Default: ${work_dir}"
- echo " -o <out_dir> Set the output directory"
- echo " Default: ${out_dir}"
- echo " -v Enable verbose output"
- echo " -h This help message"
- exit "${1}"
-}
-
-# Helper function to run make_*() only one time per architecture.
-run_once() {
- if [[ ! -e "${work_dir}/build.${1}_${arch}" ]]; then
- "$1"
- touch "${work_dir}/build.${1}_${arch}"
- fi
-}
-
-# Setup custom pacman.conf with current cache directories and custom mirrorlist.
-make_pacman_conf() {
- local _cache_dirs
- _cache_dirs=("$(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')")
- sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n "${_cache_dirs[@]}")|g" \
- "${script_path}/pacman.conf" > "${work_dir}/pacman.conf"
-}
-
-# Prepare working directory and copy custom airootfs files (airootfs)
-make_custom_airootfs() {
- local _airootfs="${work_dir}/${arch}/airootfs"
- mkdir -p -- "${_airootfs}"
-
- if [[ -d "${script_path}/airootfs" ]]; then
- cp -af --no-preserve=ownership -- "${script_path}/airootfs/." "${_airootfs}"
-
- [[ -e "${_airootfs}/etc/shadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/shadow"
- [[ -e "${_airootfs}/etc/gshadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/gshadow"
-
- # Set up user home directories and permissions
- if [[ -e "${_airootfs}/etc/passwd" ]]; then
- while IFS=':' read -a passwd -r; do
- [[ "${passwd[5]}" == '/' ]] && continue
-
- if [[ -d "${_airootfs}${passwd[5]}" ]]; then
- chown -hR -- "${passwd[2]}:${passwd[3]}" "${_airootfs}${passwd[5]}"
- chmod -f 0750 -- "${_airootfs}${passwd[5]}"
- else
- install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${_airootfs}${passwd[5]}"
- fi
- done < "${_airootfs}/etc/passwd"
- fi
- fi
-}
-
-# Packages (airootfs)
-make_packages() {
- if [[ "${gpg_key}" ]]; then
- gpg --export "${gpg_key}" >"${work_dir}/gpgkey"
- exec 17<>"${work_dir}/gpgkey"
- fi
- if [ -n "${verbose}" ]; then
- PARABOLAISO_GNUPG_FD="${gpg_key:+17}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
- else
- PARABOLAISO_GNUPG_FD="${gpg_key:+17}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
- fi
- if [[ "${gpg_key}" ]]; then
- exec 17<&-
- fi
-}
-
-# Customize installation (airootfs)
-make_customize_airootfs() {
- if [[ -e "${script_path}/airootfs/etc/passwd" ]]; then
- while IFS=':' read -a passwd -r; do
- [[ "${passwd[5]}" == '/' ]] && continue
- cp -RdT --preserve=mode,timestamps,links -- "${work_dir}/${arch}/airootfs/etc/skel" "${work_dir}/${arch}/airootfs${passwd[5]}"
- chown -hR -- "${passwd[2]}:${passwd[3]}" "${work_dir}/${arch}/airootfs${passwd[5]}"
-
- done < "${script_path}/airootfs/etc/passwd"
- fi
-
- if [[ -e "${work_dir}/${arch}/airootfs/root/customize_airootfs.sh" ]]; then
- if [ -n "${verbose}" ]; then
- mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -r '/root/customize_airootfs.sh' run
- else
- mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -r '/root/customize_airootfs.sh' run
- fi
- rm "${work_dir}/${arch}/airootfs/root/customize_airootfs.sh"
- fi
-}
-
-# Prepare kernel/initramfs ${install_dir}/boot/
-make_boot() {
- mkdir -p "${work_dir}/iso/${install_dir}/boot/${arch}"
- cp "${work_dir}/${arch}/airootfs/boot/parabolaiso.img" "${work_dir}/iso/${install_dir}/boot/${arch}/"
- cp "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-libre" "${work_dir}/iso/${install_dir}/boot/${arch}/"
-}
-
-# Add other aditional/extra files to ${install_dir}/boot/
-make_boot_extra() {
- if [[ -e "${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin" ]]; then
- # rename for PXE: https://wiki.parabola.nu/Syslinux#Using_memtest
- cp "${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin" "${work_dir}/iso/${install_dir}/boot/memtest"
- mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/"
- cp "${work_dir}/${arch}/airootfs/usr/share/licenses/common/GPL2/license.txt" \
- "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/"
- fi
-}
-
-# Prepare /${install_dir}/boot/syslinux
-make_syslinux() {
- _uname_r=$(file -b "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-libre"| awk 'f{print;f=0} /version/{f=1}' RS=' ')
- mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux"
- for _cfg in "${script_path}/syslinux/"*.cfg; do
- 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/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux/"
- cp "${work_dir}/${arch}/airootfs/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}/airootfs/usr/lib/modules/${_uname_r}/modules.alias" > \
- "${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz"
-}
-
-# Prepare /isolinux
-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}/airootfs/usr/lib/syslinux/bios/isolinux.bin" "${work_dir}/iso/isolinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin" "${work_dir}/iso/isolinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/isolinux/"
-}
-
-# Prepare /EFI
-make_efi() {
- mkdir -p "${work_dir}/iso/EFI/boot/entries"
- cp "${work_dir}/x86_64/airootfs/usr/share/refind/refind_x64.efi" \
- "${work_dir}/iso/EFI/boot/bootx64.efi"
-
- cp "${script_path}/efiboot/EFI/boot/refind.conf" "${work_dir}/iso/EFI/boot/"
-
- sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
- s|%INSTALL_DIR%|${install_dir}|g" \
- "${script_path}/efiboot/EFI/boot/entries/parabolaiso-x86_64-usb.conf" > \
- "${work_dir}/iso/EFI/boot/entries/parabolaiso-x86_64.conf"
-
- # edk2-shell based UEFI shell
- # shellx64.efi is picked up automatically when on /
- cp "${work_dir}/x86_64/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
-}
-
-# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
-make_efiboot() {
- mkdir -p "${work_dir}/iso/EFI/parabolaiso"
- truncate -s 64M "${work_dir}/iso/EFI/parabolaiso/efiboot.img"
- mkfs.fat -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"
-
- mkdir -p "${work_dir}/efiboot/EFI/parabolaiso"
- cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz-linux-libre" "${work_dir}/efiboot/EFI/parabolaiso/"
- cp "${work_dir}/iso/${install_dir}/boot/x86_64/parabolaiso.img" "${work_dir}/efiboot/EFI/parabolaiso/"
-
- mkdir -p "${work_dir}/efiboot/EFI/boot/entries"
- cp "${work_dir}/x86_64/airootfs/usr/share/refind/refind_x64.efi" \
- "${work_dir}/efiboot/EFI/boot/bootx64.efi"
-
- cp "${script_path}/efiboot/EFI/boot/refind.conf" "${work_dir}/efiboot/EFI/boot/"
-
- sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
- s|%INSTALL_DIR%|${install_dir}|g" \
- "${script_path}/efiboot/EFI/boot/entries/parabolaiso-x86_64-cd.conf" > \
- "${work_dir}/efiboot/EFI/boot/entries/parabolaiso-x86_64.conf"
-
- # shellx64.efi is picked up automatically when on /
- cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
-
- umount -d "${work_dir}/efiboot"
-}
-
-# Build airootfs filesystem image
-make_prepare() {
- cp -a -l -f "${work_dir}/${arch}/airootfs" "${work_dir}"
- if [ -n "${verbose}" ]; then
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" pkglist
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
- else
- mkparabolaiso -w "${work_dir}" -D "${install_dir}" pkglist
- mkparabolaiso -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
- fi
- rm -rf "${work_dir}/airootfs"
- # rm -rf "${work_dir}/${arch}/airootfs" (if low space, this helps)
-}
-
-# Build ISO
-make_iso() {
- if [ -n "${verbose}" ]; then
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
- -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso"
- else
- mkparabolaiso -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
- -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso"
- fi
-}
-
-if [[ ${EUID} -ne 0 ]]; then
- echo "This script must be run as root."
- _usage 1
-fi
-
-while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do
- case "${arg}" in
- N) iso_name="${OPTARG}" ;;
- V) iso_version="${OPTARG}" ;;
- L) iso_label="${OPTARG}" ;;
- P) iso_publisher="${OPTARG}" ;;
- A) iso_application="${OPTARG}" ;;
- D) install_dir="${OPTARG}" ;;
- w) work_dir="${OPTARG}" ;;
- o) out_dir="${OPTARG}" ;;
- g) gpg_key="${OPTARG}" ;;
- v) verbose="-v" ;;
- h) _usage 0 ;;
- *)
- echo "Invalid argument '${arg}'"
- _usage 1
- ;;
- esac
-done
-
-mkdir -p "${work_dir}"
-
-run_once make_pacman_conf
-
-# Do all stuff for each airootfs
-for arch in i686 x86_64; do
- run_once make_custom_airootfs
- run_once make_packages
-done
-
-for arch in i686 x86_64; do
- run_once make_customize_airootfs
-done
-
-for arch in i686 x86_64; do
- run_once make_boot
-done
-
-# Do all stuff for "iso"
-run_once make_boot_extra
-run_once make_syslinux
-run_once make_isolinux
-run_once make_efi
-run_once make_efiboot
-
-for arch in i686 x86_64; do
- run_once make_prepare
-done
-
-run_once make_iso
+printf '\n[%s] WARNING: %s\n\n' "mkparabolaiso" "build.sh scripts are deprecated! Please use mkparabolaiso directly." >&2
+_buildsh_path="$(realpath -- "$0")"
+exec mkparabolaiso "$@" -B "${_buildsh_path%/*}" build_profile
diff --git a/configs/lxde-openrc/profiledef.sh b/configs/lxde-openrc/profiledef.sh
new file mode 100644
index 0000000..c86b846
--- /dev/null
+++ b/configs/lxde-openrc/profiledef.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2034
+
+iso_name="parabola-openrc-lxde"
+iso_label="PARA_$(date +%Y%m)"
+iso_publisher="Parabola GNU/Linux-libre <https://www.parabola.nu>"
+iso_application="Parabola GNU/Linux-libre Live/Rescue CD"
+iso_version="$(date +%Y.%m.%d)"
+install_dir="parabola"
+bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.refind.esp' 'uefi-x64.refind.eltorito')
+arch="dual"
+pacman_conf="pacman.conf"
diff --git a/configs/lxde-openrc/syslinux/parabolaiso_sys32.cfg b/configs/lxde-openrc/syslinux/parabolaiso_sys32.cfg
index f1996bb..da6f10a 100644
--- a/configs/lxde-openrc/syslinux/parabolaiso_sys32.cfg
+++ b/configs/lxde-openrc/syslinux/parabolaiso_sys32.cfg
@@ -1,6 +1,8 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
+TIMEOUT 30
+
LABEL parabola32
TEXT HELP
Boot the Parabola GNU/Linux-libre (i686) live medium.
diff --git a/configs/releng-openrc/airootfs/root/customize_airootfs.sh b/configs/releng-openrc/airootfs/root/customize_airootfs.sh
index c72644a..92e57de 100755
--- a/configs/releng-openrc/airootfs/root/customize_airootfs.sh
+++ b/configs/releng-openrc/airootfs/root/customize_airootfs.sh
@@ -4,7 +4,7 @@
set -e -u
-echo 'Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future parabolaiso version.'
+# Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future parabolaiso version.
sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
locale-gen
diff --git a/configs/releng-openrc/build.sh b/configs/releng-openrc/build.sh
index 7bbabd2..9a9f654 100755
--- a/configs/releng-openrc/build.sh
+++ b/configs/releng-openrc/build.sh
@@ -1,304 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
-set -e -u
-
-iso_name=parabola-openrc
-iso_label="PARA_$(date +%Y%m)"
-iso_publisher="Parabola GNU/Linux-libre <http://www.parabola.nu>"
-iso_application="Parabola GNU/Linux-libre Live/Rescue CD"
-iso_version=$(date +%Y.%m.%d)
-install_dir=parabola
-work_dir=work
-out_dir=out
-gpg_key=""
-
-arch=$(uname -m)
-verbose=""
-script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && pwd )"
-
-export arch
-umask 0022
-
-_usage ()
-{
- echo "usage ${0} [options]"
- echo
- echo " General options:"
- echo " -N <iso_name> Set an iso filename (prefix)"
- echo " Default: ${iso_name}"
- echo " -V <iso_version> Set an iso version (in filename)"
- echo " Default: ${iso_version}"
- echo " -L <iso_label> Set an iso label (disk label)"
- echo " Default: ${iso_label}"
- echo " -P <publisher> Set a publisher for the disk"
- echo " Default: '${iso_publisher}'"
- echo " -A <application> Set an application name for the disk"
- echo " Default: '${iso_application}'"
- echo " -D <install_dir> Set an install_dir (directory inside iso)"
- echo " Default: ${install_dir}"
- echo " -w <work_dir> Set the working directory"
- echo " Default: ${work_dir}"
- echo " -o <out_dir> Set the output directory"
- echo " Default: ${out_dir}"
- echo " -v Enable verbose output"
- echo " -h This help message"
- exit "${1}"
-}
-
-# Helper function to run make_*() only one time per architecture.
-run_once() {
- if [[ ! -e "${work_dir}/build.${1}_${arch}" ]]; then
- "$1"
- touch "${work_dir}/build.${1}_${arch}"
- fi
-}
-
-# Setup custom pacman.conf with current cache directories and custom mirrorlist.
-make_pacman_conf() {
- local _cache_dirs
- _cache_dirs=("$(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')")
- sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n "${_cache_dirs[@]}")|g" \
- "${script_path}/pacman.conf" > "${work_dir}/pacman.conf"
-}
-
-# Prepare working directory and copy custom airootfs files (airootfs)
-make_custom_airootfs() {
- local _airootfs="${work_dir}/${arch}/airootfs"
- mkdir -p -- "${_airootfs}"
-
- if [[ -d "${script_path}/airootfs" ]]; then
- cp -af --no-preserve=ownership -- "${script_path}/airootfs/." "${_airootfs}"
-
- [[ -e "${_airootfs}/etc/shadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/shadow"
- [[ -e "${_airootfs}/etc/gshadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/gshadow"
-
- # Set up user home directories and permissions
- if [[ -e "${_airootfs}/etc/passwd" ]]; then
- while IFS=':' read -a passwd -r; do
- [[ "${passwd[5]}" == '/' ]] && continue
-
- if [[ -d "${_airootfs}${passwd[5]}" ]]; then
- chown -hR -- "${passwd[2]}:${passwd[3]}" "${_airootfs}${passwd[5]}"
- chmod -f 0750 -- "${_airootfs}${passwd[5]}"
- else
- install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${_airootfs}${passwd[5]}"
- fi
- done < "${_airootfs}/etc/passwd"
- fi
- fi
-}
-
-# Packages (airootfs)
-make_packages() {
- if [[ "${gpg_key}" ]]; then
- gpg --export "${gpg_key}" >"${work_dir}/gpgkey"
- exec 17<>"${work_dir}/gpgkey"
- fi
- if [ -n "${verbose}" ]; then
- PARABOLAISO_GNUPG_FD="${gpg_key:+17}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
- else
- PARABOLAISO_GNUPG_FD="${gpg_key:+17}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
- fi
- if [[ "${gpg_key}" ]]; then
- exec 17<&-
- fi
-}
-
-# Customize installation (airootfs)
-make_customize_airootfs() {
- if [[ -e "${script_path}/airootfs/etc/passwd" ]]; then
- while IFS=':' read -a passwd -r; do
- [[ "${passwd[5]}" == '/' ]] && continue
- cp -RdT --preserve=mode,timestamps,links -- "${work_dir}/${arch}/airootfs/etc/skel" "${work_dir}/${arch}/airootfs${passwd[5]}"
- chown -hR -- "${passwd[2]}:${passwd[3]}" "${work_dir}/${arch}/airootfs${passwd[5]}"
-
- done < "${script_path}/airootfs/etc/passwd"
- fi
-
- if [[ -e "${work_dir}/${arch}/airootfs/root/customize_airootfs.sh" ]]; then
- if [ -n "${verbose}" ]; then
- mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -r '/root/customize_airootfs.sh' run
- else
- mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -r '/root/customize_airootfs.sh' run
- fi
- rm "${work_dir}/${arch}/airootfs/root/customize_airootfs.sh"
- fi
-}
-
-# Prepare kernel/initramfs ${install_dir}/boot/
-make_boot() {
- mkdir -p "${work_dir}/iso/${install_dir}/boot/${arch}"
- cp "${work_dir}/${arch}/airootfs/boot/parabolaiso.img" "${work_dir}/iso/${install_dir}/boot/${arch}/"
- cp "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-libre" "${work_dir}/iso/${install_dir}/boot/${arch}/"
-}
-
-# Add other aditional/extra files to ${install_dir}/boot/
-make_boot_extra() {
- if [[ -e "${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin" ]]; then
- # rename for PXE: https://wiki.parabola.nu/Syslinux#Using_memtest
- cp "${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin" "${work_dir}/iso/${install_dir}/boot/memtest"
- mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/"
- cp "${work_dir}/${arch}/airootfs/usr/share/licenses/common/GPL2/license.txt" \
- "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/"
- fi
-}
-
-# Prepare /${install_dir}/boot/syslinux
-make_syslinux() {
- _uname_r=$(file -b "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-libre"| awk 'f{print;f=0} /version/{f=1}' RS=' ')
- mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux"
- for _cfg in "${script_path}/syslinux/"*.cfg; do
- 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/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux/"
- cp "${work_dir}/${arch}/airootfs/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}/airootfs/usr/lib/modules/${_uname_r}/modules.alias" > \
- "${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz"
-}
-
-# Prepare /isolinux
-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}/airootfs/usr/lib/syslinux/bios/isolinux.bin" "${work_dir}/iso/isolinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin" "${work_dir}/iso/isolinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/isolinux/"
-}
-
-# Prepare /EFI
-make_efi() {
- mkdir -p "${work_dir}/iso/EFI/boot/entries"
- cp "${work_dir}/x86_64/airootfs/usr/share/refind/refind_x64.efi" \
- "${work_dir}/iso/EFI/boot/bootx64.efi"
-
- cp "${script_path}/efiboot/EFI/boot/refind.conf" "${work_dir}/iso/EFI/boot/"
-
- sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
- s|%INSTALL_DIR%|${install_dir}|g" \
- "${script_path}/efiboot/EFI/boot/entries/parabolaiso-x86_64-usb.conf" > \
- "${work_dir}/iso/EFI/boot/entries/parabolaiso-x86_64.conf"
-
- # edk2-shell based UEFI shell
- # shellx64.efi is picked up automatically when on /
- cp "${work_dir}/x86_64/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
-}
-
-# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
-make_efiboot() {
- mkdir -p "${work_dir}/iso/EFI/parabolaiso"
- truncate -s 64M "${work_dir}/iso/EFI/parabolaiso/efiboot.img"
- mkfs.fat -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"
-
- mkdir -p "${work_dir}/efiboot/EFI/parabolaiso"
- cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz-linux-libre" "${work_dir}/efiboot/EFI/parabolaiso/"
- cp "${work_dir}/iso/${install_dir}/boot/x86_64/parabolaiso.img" "${work_dir}/efiboot/EFI/parabolaiso/"
-
- mkdir -p "${work_dir}/efiboot/EFI/boot/entries"
- cp "${work_dir}/x86_64/airootfs/usr/share/refind/refind_x64.efi" \
- "${work_dir}/efiboot/EFI/boot/bootx64.efi"
-
- cp "${script_path}/efiboot/EFI/boot/refind.conf" "${work_dir}/efiboot/EFI/boot/"
-
- sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
- s|%INSTALL_DIR%|${install_dir}|g" \
- "${script_path}/efiboot/EFI/boot/entries/parabolaiso-x86_64-cd.conf" > \
- "${work_dir}/efiboot/EFI/boot/entries/parabolaiso-x86_64.conf"
-
- # shellx64.efi is picked up automatically when on /
- cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
-
- umount -d "${work_dir}/efiboot"
-}
-
-# Build airootfs filesystem image
-make_prepare() {
- cp -a -l -f "${work_dir}/${arch}/airootfs" "${work_dir}"
- if [ -n "${verbose}" ]; then
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" pkglist
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
- else
- mkparabolaiso -w "${work_dir}" -D "${install_dir}" pkglist
- mkparabolaiso -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
- fi
- rm -rf "${work_dir}/airootfs"
- # rm -rf "${work_dir}/${arch}/airootfs" (if low space, this helps)
-}
-
-# Build ISO
-make_iso() {
- if [ -n "${verbose}" ]; then
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
- -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso"
- else
- mkparabolaiso -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
- -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso"
- fi
-}
-
-if [[ ${EUID} -ne 0 ]]; then
- echo "This script must be run as root."
- _usage 1
-fi
-
-while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do
- case "${arg}" in
- N) iso_name="${OPTARG}" ;;
- V) iso_version="${OPTARG}" ;;
- L) iso_label="${OPTARG}" ;;
- P) iso_publisher="${OPTARG}" ;;
- A) iso_application="${OPTARG}" ;;
- D) install_dir="${OPTARG}" ;;
- w) work_dir="${OPTARG}" ;;
- o) out_dir="${OPTARG}" ;;
- g) gpg_key="${OPTARG}" ;;
- v) verbose="-v" ;;
- h) _usage 0 ;;
- *)
- echo "Invalid argument '${arg}'"
- _usage 1
- ;;
- esac
-done
-
-mkdir -p "${work_dir}"
-
-run_once make_pacman_conf
-
-# Do all stuff for each airootfs
-for arch in i686 x86_64; do
- run_once make_custom_airootfs
- run_once make_packages
-done
-
-for arch in i686 x86_64; do
- run_once make_customize_airootfs
-done
-
-for arch in i686 x86_64; do
- run_once make_boot
-done
-
-# Do all stuff for "iso"
-run_once make_boot_extra
-run_once make_syslinux
-run_once make_isolinux
-run_once make_efi
-run_once make_efiboot
-
-for arch in i686 x86_64; do
- run_once make_prepare
-done
-
-run_once make_iso
+printf '\n[%s] WARNING: %s\n\n' "mkparabolaiso" "build.sh scripts are deprecated! Please use mkparabolaiso directly." >&2
+_buildsh_path="$(realpath -- "$0")"
+exec mkparabolaiso "$@" -B "${_buildsh_path%/*}" build_profile
diff --git a/configs/releng-openrc/profiledef.sh b/configs/releng-openrc/profiledef.sh
new file mode 100644
index 0000000..11a74c8
--- /dev/null
+++ b/configs/releng-openrc/profiledef.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2034
+
+iso_name="parabola-openrc"
+iso_label="PARA_$(date +%Y%m)"
+iso_publisher="Parabola GNU/Linux-libre <https://www.parabola.nu>"
+iso_application="Parabola GNU/Linux-libre Live/Rescue CD"
+iso_version="$(date +%Y.%m.%d)"
+install_dir="parabola"
+bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.refind.esp' 'uefi-x64.refind.eltorito')
+arch="dual"
+pacman_conf="pacman.conf"
diff --git a/configs/releng-openrc/syslinux/parabolaiso_sys32.cfg b/configs/releng-openrc/syslinux/parabolaiso_sys32.cfg
index f1996bb..da6f10a 100644
--- a/configs/releng-openrc/syslinux/parabolaiso_sys32.cfg
+++ b/configs/releng-openrc/syslinux/parabolaiso_sys32.cfg
@@ -1,6 +1,8 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
+TIMEOUT 30
+
LABEL parabola32
TEXT HELP
Boot the Parabola GNU/Linux-libre (i686) live medium.
diff --git a/configs/releng/airootfs/root/customize_airootfs.sh b/configs/releng/airootfs/root/customize_airootfs.sh
index c72644a..92e57de 100755
--- a/configs/releng/airootfs/root/customize_airootfs.sh
+++ b/configs/releng/airootfs/root/customize_airootfs.sh
@@ -4,7 +4,7 @@
set -e -u
-echo 'Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future parabolaiso version.'
+# Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future parabolaiso version.
sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
locale-gen
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 10ca01f..9a9f654 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -2,307 +2,6 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
-set -e -u
-
-iso_name=parabola
-iso_label="PARA_$(date +%Y%m)"
-iso_publisher="Parabola GNU/Linux-libre <http://www.parabola.nu>"
-iso_application="Parabola GNU/Linux-libre Live/Rescue CD"
-iso_version=$(date +%Y.%m.%d)
-install_dir=parabola
-work_dir=work
-out_dir=out
-gpg_key=""
-
-arch=$(uname -m)
-verbose=""
-script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && pwd )"
-
-export arch
-umask 0022
-
-_usage ()
-{
- echo "usage ${0} [options]"
- echo
- echo " General options:"
- echo " -N <iso_name> Set an iso filename (prefix)"
- echo " Default: ${iso_name}"
- echo " -V <iso_version> Set an iso version (in filename)"
- echo " Default: ${iso_version}"
- echo " -L <iso_label> Set an iso label (disk label)"
- echo " Default: ${iso_label}"
- echo " -P <publisher> Set a publisher for the disk"
- echo " Default: '${iso_publisher}'"
- echo " -A <application> Set an application name for the disk"
- echo " Default: '${iso_application}'"
- echo " -D <install_dir> Set an install_dir (directory inside iso)"
- echo " Default: ${install_dir}"
- echo " -w <work_dir> Set the working directory"
- echo " Default: ${work_dir}"
- echo " -o <out_dir> Set the output directory"
- echo " Default: ${out_dir}"
- echo " -v Enable verbose output"
- echo " -h This help message"
- exit "${1}"
-}
-
-# Helper function to run make_*() only one time per architecture.
-run_once() {
- if [[ ! -e "${work_dir}/build.${1}_${arch}" ]]; then
- "$1"
- touch "${work_dir}/build.${1}_${arch}"
- fi
-}
-
-# Setup custom pacman.conf with current cache directories and custom mirrorlist.
-make_pacman_conf() {
- local _cache_dirs
- _cache_dirs=("$(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')")
- sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n "${_cache_dirs[@]}")|g" \
- "${script_path}/pacman.conf" > "${work_dir}/pacman.conf"
-}
-
-# Prepare working directory and copy custom airootfs files (airootfs)
-make_custom_airootfs() {
- local _airootfs="${work_dir}/${arch}/airootfs"
- mkdir -p -- "${_airootfs}"
-
- if [[ -d "${script_path}/airootfs" ]]; then
- cp -af --no-preserve=ownership -- "${script_path}/airootfs/." "${_airootfs}"
-
- [[ -e "${_airootfs}/etc/shadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/shadow"
- [[ -e "${_airootfs}/etc/gshadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/gshadow"
-
- # Set up user home directories and permissions
- if [[ -e "${_airootfs}/etc/passwd" ]]; then
- while IFS=':' read -a passwd -r; do
- [[ "${passwd[5]}" == '/' ]] && continue
-
- if [[ -d "${_airootfs}${passwd[5]}" ]]; then
- chown -hR -- "${passwd[2]}:${passwd[3]}" "${_airootfs}${passwd[5]}"
- chmod -f 0750 -- "${_airootfs}${passwd[5]}"
- else
- install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${_airootfs}${passwd[5]}"
- fi
- done < "${_airootfs}/etc/passwd"
- fi
- fi
-}
-
-# Packages (airootfs)
-make_packages() {
- if [[ "${gpg_key}" ]]; then
- gpg --export "${gpg_key}" >"${work_dir}/gpgkey"
- exec 17<>"${work_dir}/gpgkey"
- fi
- if [ -n "${verbose}" ]; then
- PARABOLAISO_GNUPG_FD="${gpg_key:+17}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
- else
- PARABOLAISO_GNUPG_FD="${gpg_key:+17}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
- fi
- if [[ "${gpg_key}" ]]; then
- exec 17<&-
- fi
-}
-
-# Customize installation (airootfs)
-make_customize_airootfs() {
- if [[ -e "${script_path}/airootfs/etc/passwd" ]]; then
- while IFS=':' read -a passwd -r; do
- [[ "${passwd[5]}" == '/' ]] && continue
- cp -RdT --preserve=mode,timestamps,links -- "${work_dir}/${arch}/airootfs/etc/skel" "${work_dir}/${arch}/airootfs${passwd[5]}"
- chown -hR -- "${passwd[2]}:${passwd[3]}" "${work_dir}/${arch}/airootfs${passwd[5]}"
-
- done < "${script_path}/airootfs/etc/passwd"
- fi
-
- if [[ -e "${work_dir}/${arch}/airootfs/root/customize_airootfs.sh" ]]; then
- if [ -n "${verbose}" ]; then
- mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -r '/root/customize_airootfs.sh' run
- else
- mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -r '/root/customize_airootfs.sh' run
- fi
- rm "${work_dir}/${arch}/airootfs/root/customize_airootfs.sh"
- fi
-}
-
-# Prepare kernel/initramfs ${install_dir}/boot/
-make_boot() {
- mkdir -p "${work_dir}/iso/${install_dir}/boot/${arch}"
- cp "${work_dir}/${arch}/airootfs/boot/parabolaiso.img" "${work_dir}/iso/${install_dir}/boot/${arch}/"
- cp "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-libre" "${work_dir}/iso/${install_dir}/boot/${arch}/"
-}
-
-# Add other aditional/extra files to ${install_dir}/boot/
-make_boot_extra() {
- if [[ -e "${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin" ]]; then
- # rename for PXE: https://wiki.parabola.nu/Syslinux#Using_memtest
- cp "${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin" "${work_dir}/iso/${install_dir}/boot/memtest"
- mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/"
- cp "${work_dir}/${arch}/airootfs/usr/share/licenses/common/GPL2/license.txt" \
- "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/"
- fi
-}
-
-# Prepare /${install_dir}/boot/syslinux
-make_syslinux() {
- _uname_r=$(file -b "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-libre"| awk 'f{print;f=0} /version/{f=1}' RS=' ')
- mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux"
- for _cfg in "${script_path}/syslinux/"*.cfg; do
- 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/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux/"
- cp "${work_dir}/${arch}/airootfs/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}/airootfs/usr/lib/modules/${_uname_r}/modules.alias" > \
- "${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz"
-}
-
-# Prepare /isolinux
-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}/airootfs/usr/lib/syslinux/bios/isolinux.bin" "${work_dir}/iso/isolinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin" "${work_dir}/iso/isolinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/isolinux/"
-}
-
-# Prepare /EFI
-make_efi() {
- mkdir -p "${work_dir}/iso/EFI/boot"
- cp "${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
- "${work_dir}/iso/EFI/boot/bootx64.efi"
-
- mkdir -p "${work_dir}/iso/loader/entries"
- cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/iso/loader/"
-
- 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"
-
- # edk2-shell based UEFI shell
- # shellx64.efi is picked up automatically when on /
- cp "${work_dir}/x86_64/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
-}
-
-# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
-make_efiboot() {
- mkdir -p "${work_dir}/iso/EFI/parabolaiso"
- truncate -s 64M "${work_dir}/iso/EFI/parabolaiso/efiboot.img"
- mkfs.fat -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"
-
- mkdir -p "${work_dir}/efiboot/EFI/parabolaiso"
- cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz-linux-libre" "${work_dir}/efiboot/EFI/parabolaiso/"
- cp "${work_dir}/iso/${install_dir}/boot/x86_64/parabolaiso.img" "${work_dir}/efiboot/EFI/parabolaiso/"
-
- mkdir -p "${work_dir}/efiboot/EFI/boot"
- cp "${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
- "${work_dir}/efiboot/EFI/boot/bootx64.efi"
-
- mkdir -p "${work_dir}/efiboot/loader/entries"
- cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/efiboot/loader/"
-
- 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"
-
- # shellx64.efi is picked up automatically when on /
- cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
-
- umount -d "${work_dir}/efiboot"
-}
-
-# Build airootfs filesystem image
-make_prepare() {
- cp -a -l -f "${work_dir}/${arch}/airootfs" "${work_dir}"
- if [ -n "${verbose}" ]; then
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" pkglist
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
- else
- mkparabolaiso -w "${work_dir}" -D "${install_dir}" pkglist
- mkparabolaiso -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
- fi
- rm -rf "${work_dir}/airootfs"
- # rm -rf "${work_dir}/${arch}/airootfs" (if low space, this helps)
-}
-
-# Build ISO
-make_iso() {
- if [ -n "${verbose}" ]; then
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
- -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso"
- else
- mkparabolaiso -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
- -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso"
- fi
-}
-
-if [[ ${EUID} -ne 0 ]]; then
- echo "This script must be run as root."
- _usage 1
-fi
-
-while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do
- case "${arg}" in
- N) iso_name="${OPTARG}" ;;
- V) iso_version="${OPTARG}" ;;
- L) iso_label="${OPTARG}" ;;
- P) iso_publisher="${OPTARG}" ;;
- A) iso_application="${OPTARG}" ;;
- D) install_dir="${OPTARG}" ;;
- w) work_dir="${OPTARG}" ;;
- o) out_dir="${OPTARG}" ;;
- g) gpg_key="${OPTARG}" ;;
- v) verbose="-v" ;;
- h) _usage 0 ;;
- *)
- echo "Invalid argument '${arg}'"
- _usage 1
- ;;
- esac
-done
-
-mkdir -p "${work_dir}"
-
-run_once make_pacman_conf
-
-# Do all stuff for each airootfs
-for arch in i686 x86_64; do
- run_once make_custom_airootfs
- run_once make_packages
-done
-
-for arch in i686 x86_64; do
- run_once make_customize_airootfs
-done
-
-for arch in i686 x86_64; do
- run_once make_boot
-done
-
-# Do all stuff for "iso"
-run_once make_boot_extra
-run_once make_syslinux
-run_once make_isolinux
-run_once make_efi
-run_once make_efiboot
-
-for arch in i686 x86_64; do
- run_once make_prepare
-done
-
-run_once make_iso
+printf '\n[%s] WARNING: %s\n\n' "mkparabolaiso" "build.sh scripts are deprecated! Please use mkparabolaiso directly." >&2
+_buildsh_path="$(realpath -- "$0")"
+exec mkparabolaiso "$@" -B "${_buildsh_path%/*}" build_profile
diff --git a/configs/releng/profiledef.sh b/configs/releng/profiledef.sh
new file mode 100644
index 0000000..70927d6
--- /dev/null
+++ b/configs/releng/profiledef.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2034
+
+iso_name="parabola"
+iso_label="PARA_$(date +%Y%m)"
+iso_publisher="Parabola GNU/Linux-libre <https://www.parabola.nu>"
+iso_application="Parabola GNU/Linux-libre Live/Rescue CD"
+iso_version="$(date +%Y.%m.%d)"
+install_dir="parabola"
+bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
+arch="dual"
+pacman_conf="pacman.conf"
diff --git a/configs/releng/syslinux/parabolaiso_sys32.cfg b/configs/releng/syslinux/parabolaiso_sys32.cfg
index f1996bb..da6f10a 100644
--- a/configs/releng/syslinux/parabolaiso_sys32.cfg
+++ b/configs/releng/syslinux/parabolaiso_sys32.cfg
@@ -1,6 +1,8 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
+TIMEOUT 30
+
LABEL parabola32
TEXT HELP
Boot the Parabola GNU/Linux-libre (i686) live medium.
diff --git a/configs/talkingparabola/airootfs/root/customize_airootfs.sh b/configs/talkingparabola/airootfs/root/customize_airootfs.sh
index c72644a..92e57de 100755
--- a/configs/talkingparabola/airootfs/root/customize_airootfs.sh
+++ b/configs/talkingparabola/airootfs/root/customize_airootfs.sh
@@ -4,7 +4,7 @@
set -e -u
-echo 'Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future parabolaiso version.'
+# Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future parabolaiso version.
sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
locale-gen
diff --git a/configs/talkingparabola/build.sh b/configs/talkingparabola/build.sh
index d0901ed..9a9f654 100755
--- a/configs/talkingparabola/build.sh
+++ b/configs/talkingparabola/build.sh
@@ -2,307 +2,6 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
-set -e -u
-
-iso_name=talkingparabola
-iso_label="PARA_$(date +%Y%m)"
-iso_publisher="Parabola GNU/Linux-libre <http://www.parabola.nu>"
-iso_application="Parabola GNU/Linux-libre Live/Rescue CD"
-iso_version=$(date +%Y.%m.%d)
-install_dir=parabola
-work_dir=work
-out_dir=out
-gpg_key=""
-
-arch=$(uname -m)
-verbose=""
-script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && pwd )"
-
-export arch
-umask 0022
-
-_usage ()
-{
- echo "usage ${0} [options]"
- echo
- echo " General options:"
- echo " -N <iso_name> Set an iso filename (prefix)"
- echo " Default: ${iso_name}"
- echo " -V <iso_version> Set an iso version (in filename)"
- echo " Default: ${iso_version}"
- echo " -L <iso_label> Set an iso label (disk label)"
- echo " Default: ${iso_label}"
- echo " -P <publisher> Set a publisher for the disk"
- echo " Default: '${iso_publisher}'"
- echo " -A <application> Set an application name for the disk"
- echo " Default: '${iso_application}'"
- echo " -D <install_dir> Set an install_dir (directory inside iso)"
- echo " Default: ${install_dir}"
- echo " -w <work_dir> Set the working directory"
- echo " Default: ${work_dir}"
- echo " -o <out_dir> Set the output directory"
- echo " Default: ${out_dir}"
- echo " -v Enable verbose output"
- echo " -h This help message"
- exit "${1}"
-}
-
-# Helper function to run make_*() only one time per architecture.
-run_once() {
- if [[ ! -e "${work_dir}/build.${1}_${arch}" ]]; then
- "$1"
- touch "${work_dir}/build.${1}_${arch}"
- fi
-}
-
-# Setup custom pacman.conf with current cache directories and custom mirrorlist.
-make_pacman_conf() {
- local _cache_dirs
- _cache_dirs=("$(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')")
- sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n "${_cache_dirs[@]}")|g" \
- "${script_path}/pacman.conf" > "${work_dir}/pacman.conf"
-}
-
-# Prepare working directory and copy custom airootfs files (airootfs)
-make_custom_airootfs() {
- local _airootfs="${work_dir}/${arch}/airootfs"
- mkdir -p -- "${_airootfs}"
-
- if [[ -d "${script_path}/airootfs" ]]; then
- cp -af --no-preserve=ownership -- "${script_path}/airootfs/." "${_airootfs}"
-
- [[ -e "${_airootfs}/etc/shadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/shadow"
- [[ -e "${_airootfs}/etc/gshadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/gshadow"
-
- # Set up user home directories and permissions
- if [[ -e "${_airootfs}/etc/passwd" ]]; then
- while IFS=':' read -a passwd -r; do
- [[ "${passwd[5]}" == '/' ]] && continue
-
- if [[ -d "${_airootfs}${passwd[5]}" ]]; then
- chown -hR -- "${passwd[2]}:${passwd[3]}" "${_airootfs}${passwd[5]}"
- chmod -f 0750 -- "${_airootfs}${passwd[5]}"
- else
- install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${_airootfs}${passwd[5]}"
- fi
- done < "${_airootfs}/etc/passwd"
- fi
- fi
-}
-
-# Packages (airootfs)
-make_packages() {
- if [[ "${gpg_key}" ]]; then
- gpg --export "${gpg_key}" >"${work_dir}/gpgkey"
- exec 17<>"${work_dir}/gpgkey"
- fi
- if [ -n "${verbose}" ]; then
- PARABOLAISO_GNUPG_FD="${gpg_key:+17}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
- else
- PARABOLAISO_GNUPG_FD="${gpg_key:+17}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
- fi
- if [[ "${gpg_key}" ]]; then
- exec 17<&-
- fi
-}
-
-# Customize installation (airootfs)
-make_customize_airootfs() {
- if [[ -e "${script_path}/airootfs/etc/passwd" ]]; then
- while IFS=':' read -a passwd -r; do
- [[ "${passwd[5]}" == '/' ]] && continue
- cp -RdT --preserve=mode,timestamps,links -- "${work_dir}/${arch}/airootfs/etc/skel" "${work_dir}/${arch}/airootfs${passwd[5]}"
- chown -hR -- "${passwd[2]}:${passwd[3]}" "${work_dir}/${arch}/airootfs${passwd[5]}"
-
- done < "${script_path}/airootfs/etc/passwd"
- fi
-
- if [[ -e "${work_dir}/${arch}/airootfs/root/customize_airootfs.sh" ]]; then
- if [ -n "${verbose}" ]; then
- mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -r '/root/customize_airootfs.sh' run
- else
- mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -r '/root/customize_airootfs.sh' run
- fi
- rm "${work_dir}/${arch}/airootfs/root/customize_airootfs.sh"
- fi
-}
-
-# Prepare kernel/initramfs ${install_dir}/boot/
-make_boot() {
- mkdir -p "${work_dir}/iso/${install_dir}/boot/${arch}"
- cp "${work_dir}/${arch}/airootfs/boot/parabolaiso.img" "${work_dir}/iso/${install_dir}/boot/${arch}/"
- cp "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-libre" "${work_dir}/iso/${install_dir}/boot/${arch}/"
-}
-
-# Add other aditional/extra files to ${install_dir}/boot/
-make_boot_extra() {
- if [[ -e "${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin" ]]; then
- # rename for PXE: https://wiki.parabola.nu/Syslinux#Using_memtest
- cp "${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin" "${work_dir}/iso/${install_dir}/boot/memtest"
- mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/"
- cp "${work_dir}/${arch}/airootfs/usr/share/licenses/common/GPL2/license.txt" \
- "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/"
- fi
-}
-
-# Prepare /${install_dir}/boot/syslinux
-make_syslinux() {
- _uname_r=$(file -b "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-libre"| awk 'f{print;f=0} /version/{f=1}' RS=' ')
- mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux"
- for _cfg in "${script_path}/syslinux/"*.cfg; do
- 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/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux/"
- cp "${work_dir}/${arch}/airootfs/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}/airootfs/usr/lib/modules/${_uname_r}/modules.alias" > \
- "${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz"
-}
-
-# Prepare /isolinux
-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}/airootfs/usr/lib/syslinux/bios/isolinux.bin" "${work_dir}/iso/isolinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin" "${work_dir}/iso/isolinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/isolinux/"
-}
-
-# Prepare /EFI
-make_efi() {
- mkdir -p "${work_dir}/iso/EFI/boot"
- cp "${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
- "${work_dir}/iso/EFI/boot/bootx64.efi"
-
- mkdir -p "${work_dir}/iso/loader/entries"
- cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/iso/loader/"
-
- 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"
-
- # edk2-shell based UEFI shell
- # shellx64.efi is picked up automatically when on /
- cp "${work_dir}/x86_64/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
-}
-
-# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
-make_efiboot() {
- mkdir -p "${work_dir}/iso/EFI/parabolaiso"
- truncate -s 64M "${work_dir}/iso/EFI/parabolaiso/efiboot.img"
- mkfs.fat -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"
-
- mkdir -p "${work_dir}/efiboot/EFI/parabolaiso"
- cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz-linux-libre" "${work_dir}/efiboot/EFI/parabolaiso/"
- cp "${work_dir}/iso/${install_dir}/boot/x86_64/parabolaiso.img" "${work_dir}/efiboot/EFI/parabolaiso/"
-
- mkdir -p "${work_dir}/efiboot/EFI/boot"
- cp "${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
- "${work_dir}/efiboot/EFI/boot/bootx64.efi"
-
- mkdir -p "${work_dir}/efiboot/loader/entries"
- cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/efiboot/loader/"
-
- 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"
-
- # shellx64.efi is picked up automatically when on /
- cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
-
- umount -d "${work_dir}/efiboot"
-}
-
-# Build airootfs filesystem image
-make_prepare() {
- cp -a -l -f "${work_dir}/${arch}/airootfs" "${work_dir}"
- if [ -n "${verbose}" ]; then
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" pkglist
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
- else
- mkparabolaiso -w "${work_dir}" -D "${install_dir}" pkglist
- mkparabolaiso -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
- fi
- rm -rf "${work_dir}/airootfs"
- # rm -rf "${work_dir}/${arch}/airootfs" (if low space, this helps)
-}
-
-# Build ISO
-make_iso() {
- if [ -n "${verbose}" ]; then
- mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
- -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso"
- else
- mkparabolaiso -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
- -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso"
- fi
-}
-
-if [[ ${EUID} -ne 0 ]]; then
- echo "This script must be run as root."
- _usage 1
-fi
-
-while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do
- case "${arg}" in
- N) iso_name="${OPTARG}" ;;
- V) iso_version="${OPTARG}" ;;
- L) iso_label="${OPTARG}" ;;
- P) iso_publisher="${OPTARG}" ;;
- A) iso_application="${OPTARG}" ;;
- D) install_dir="${OPTARG}" ;;
- w) work_dir="${OPTARG}" ;;
- o) out_dir="${OPTARG}" ;;
- g) gpg_key="${OPTARG}" ;;
- v) verbose="-v" ;;
- h) _usage 0 ;;
- *)
- echo "Invalid argument '${arg}'"
- _usage 1
- ;;
- esac
-done
-
-mkdir -p "${work_dir}"
-
-run_once make_pacman_conf
-
-# Do all stuff for each airootfs
-for arch in i686 x86_64; do
- run_once make_custom_airootfs
- run_once make_packages
-done
-
-for arch in i686 x86_64; do
- run_once make_customize_airootfs
-done
-
-for arch in i686 x86_64; do
- run_once make_boot
-done
-
-# Do all stuff for "iso"
-run_once make_boot_extra
-run_once make_syslinux
-run_once make_isolinux
-run_once make_efi
-run_once make_efiboot
-
-for arch in i686 x86_64; do
- run_once make_prepare
-done
-
-run_once make_iso
+printf '\n[%s] WARNING: %s\n\n' "mkparabolaiso" "build.sh scripts are deprecated! Please use mkparabolaiso directly." >&2
+_buildsh_path="$(realpath -- "$0")"
+exec mkparabolaiso "$@" -B "${_buildsh_path%/*}" build_profile
diff --git a/configs/talkingparabola/profiledef.sh b/configs/talkingparabola/profiledef.sh
new file mode 100644
index 0000000..e62388f
--- /dev/null
+++ b/configs/talkingparabola/profiledef.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2034
+
+iso_name="talkingparabola"
+iso_label="PARA_$(date +%Y%m)"
+iso_publisher="Parabola GNU/Linux-libre <https://www.parabola.nu>"
+iso_application="Parabola GNU/Linux-libre Live/Rescue CD"
+iso_version="$(date +%Y.%m.%d)"
+install_dir="parabola"
+bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
+arch="dual"
+pacman_conf="pacman.conf"
diff --git a/configs/talkingparabola/syslinux/parabolaiso_sys32.cfg b/configs/talkingparabola/syslinux/parabolaiso_sys32.cfg
index ec49748..e791d82 100644
--- a/configs/talkingparabola/syslinux/parabolaiso_sys32.cfg
+++ b/configs/talkingparabola/syslinux/parabolaiso_sys32.cfg
@@ -1,6 +1,8 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
+TIMEOUT 30
+
LABEL parabola32speech
TEXT HELP
Boot the Parabola GNU/Linux-libre (i686) live medium with speakup enabled.