summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-07-15 13:03:06 -0400
committerDavid P <megver83@parabola.nu>2020-07-15 13:03:06 -0400
commit48262877271f3aaf9f5fff5183dfa8f52b5437ce (patch)
tree6dbd7ab389ae84eeda3a01c1b610ac2a57fc09cf /configs
parentd5624a36114284c5821daba2734a0e5e339b39b6 (diff)
[lxde-openrc] update according to releng-openrc
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'configs')
-rwxr-xr-xconfigs/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector4
-rw-r--r--configs/lxde-openrc/airootfs/etc/elogind/logind.conf.d/do-not-suspend.conf4
l---------configs/lxde-openrc/airootfs/etc/localtime1
-rwxr-xr-xconfigs/lxde-openrc/airootfs/root/.automated_script.sh4
-rwxr-xr-xconfigs/lxde-openrc/airootfs/root/customize_airootfs.sh4
-rwxr-xr-xconfigs/lxde-openrc/build.sh232
-rw-r--r--configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf6
-rw-r--r--configs/lxde-openrc/packages.both10
-rw-r--r--configs/lxde-openrc/syslinux/parabolaiso_head.cfg2
9 files changed, 142 insertions, 125 deletions
diff --git a/configs/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector b/configs/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector
new file mode 100755
index 0000000..07dcc16
--- /dev/null
+++ b/configs/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector
@@ -0,0 +1,4 @@
+#!/bin/bash
+if [ $2 = up ]; then
+ /usr/bin/reflector --protocol https --age 1 --sort rate --save /etc/pacman.d/mirrorlist
+fi
diff --git a/configs/lxde-openrc/airootfs/etc/elogind/logind.conf.d/do-not-suspend.conf b/configs/lxde-openrc/airootfs/etc/elogind/logind.conf.d/do-not-suspend.conf
new file mode 100644
index 0000000..f3ecb39
--- /dev/null
+++ b/configs/lxde-openrc/airootfs/etc/elogind/logind.conf.d/do-not-suspend.conf
@@ -0,0 +1,4 @@
+[Login]
+HandleSuspendKey=ignore
+HandleHibernateKey=ignore
+HandleLidSwitch=ignore
diff --git a/configs/lxde-openrc/airootfs/etc/localtime b/configs/lxde-openrc/airootfs/etc/localtime
new file mode 120000
index 0000000..0e35b57
--- /dev/null
+++ b/configs/lxde-openrc/airootfs/etc/localtime
@@ -0,0 +1 @@
+/usr/share/zoneinfo/UTC \ No newline at end of file
diff --git a/configs/lxde-openrc/airootfs/root/.automated_script.sh b/configs/lxde-openrc/airootfs/root/.automated_script.sh
index fb106da..0159a8f 100755
--- a/configs/lxde-openrc/airootfs/root/.automated_script.sh
+++ b/configs/lxde-openrc/airootfs/root/.automated_script.sh
@@ -15,8 +15,8 @@ automated_script ()
local script rt
script="$(script_cmdline)"
if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then
- if [[ "${script}" =~ ^http:// || "${script}" =~ ^ftp:// ]]; then
- wget "${script}" --retry-connrefused -q -O /tmp/startup_script >/dev/null
+ if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then
+ curl "${script}" --retry-connrefused -s -o /tmp/startup_script >/dev/null
rt=$?
else
cp "${script}" /tmp/startup_script
diff --git a/configs/lxde-openrc/airootfs/root/customize_airootfs.sh b/configs/lxde-openrc/airootfs/root/customize_airootfs.sh
index 4b6c02b..47030c3 100755
--- a/configs/lxde-openrc/airootfs/root/customize_airootfs.sh
+++ b/configs/lxde-openrc/airootfs/root/customize_airootfs.sh
@@ -21,10 +21,6 @@ chmod 700 /root
sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config
sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist
-sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/elogind/logind.conf
-sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/elogind/logind.conf
-sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' /etc/elogind/logind.conf
-
rc-update add NetworkManager default
sed -i "s/_DATE_/$(date +%Y.%m.%d)/" /etc/motd
diff --git a/configs/lxde-openrc/build.sh b/configs/lxde-openrc/build.sh
index 6bce39b..fc97fee 100755
--- a/configs/lxde-openrc/build.sh
+++ b/configs/lxde-openrc/build.sh
@@ -11,11 +11,11 @@ iso_title="Parabola GNU/Linux-libre - LXDE Desktop LiveCD"
install_dir=parabola
work_dir=work
out_dir=out
-gpg_key=
+gpg_key=""
arch=$(uname -m)
verbose=""
-script_path=$(readlink -f ${0%/*})
+script_path=$(readlink -f "${0%/*}")
# Init system. Options are:
# - openrc
@@ -48,107 +48,130 @@ _usage ()
echo " Default: ${out_dir}"
echo " -v Enable verbose output"
echo " -h This help message"
- exit ${1}
+ exit "${1}"
}
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}
+ 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
+ _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"
}
# Base installation, plus needed packages (airootfs)
make_basefs() {
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" init
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" -p "haveged memtest86+ mkinitcpio-nfs-utils nbd zsh efitools" install
+ if [ -n "${verbose}" ]; then
+ arch="${arch}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" init
+ arch="${arch}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" \
+ -p "haveged memtest86+ mkinitcpio-nfs-utils nbd zsh" install
+ else
+ arch="${arch}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" init
+ arch="${arch}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -i "${init}" \
+ -p "haveged memtest86+ mkinitcpio-nfs-utils nbd zsh" install
+ fi
}
# Additional packages (airootfs)
make_packages() {
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "$(grep -h -v ^# ${script_path}/packages.{both,${arch}})" install
-}
-
-# Needed packages for x86_64 EFI boot
-make_packages_efi() {
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "efitools refind-efi" install
+ if [ -n "${verbose}" ]; then
+ arch="${arch}" 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
+ arch="${arch}" 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
}
# Copy mkinitcpio parabolaiso hooks and build initramfs (airootfs)
make_setup_mkinitcpio() {
local _hook
- mkdir -p ${work_dir}/${arch}/airootfs/etc/initcpio/hooks
- mkdir -p ${work_dir}/${arch}/airootfs/etc/initcpio/install
+ mkdir -p "${work_dir}/${arch}/airootfs/etc/initcpio/hooks"
+ mkdir -p "${work_dir}/${arch}/airootfs/etc/initcpio/install"
for _hook in parabolaiso parabolaiso_shutdown parabolaiso_pxe_common parabolaiso_pxe_nbd parabolaiso_pxe_http parabolaiso_pxe_nfs parabolaiso_loop_mnt; do
- cp /usr/lib/initcpio/hooks/${_hook} ${work_dir}/${arch}/airootfs/etc/initcpio/hooks
- cp /usr/lib/initcpio/install/${_hook} ${work_dir}/${arch}/airootfs/etc/initcpio/install
+ cp "/usr/lib/initcpio/hooks/${_hook}" "${work_dir}/${arch}/airootfs/etc/initcpio/hooks"
+ cp "/usr/lib/initcpio/install/${_hook}" "${work_dir}/${arch}/airootfs/etc/initcpio/install"
done
- sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" ${work_dir}/${arch}/airootfs/etc/initcpio/install/parabolaiso_shutdown
- cp /usr/lib/initcpio/install/parabolaiso_kms ${work_dir}/${arch}/airootfs/etc/initcpio/install
- cp /usr/lib/initcpio/parabolaiso_shutdown ${work_dir}/${arch}/airootfs/etc/initcpio
- cp ${script_path}/mkinitcpio.conf ${work_dir}/${arch}/airootfs/etc/mkinitcpio-parabolaiso.conf
- gnupg_fd=
- if [[ ${gpg_key} ]]; then
- gpg --export ${gpg_key} >${work_dir}/gpgkey
- exec 17<>${work_dir}/gpgkey
+ sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" "${work_dir}/${arch}/airootfs/etc/initcpio/install/parabolaiso_shutdown"
+ cp /usr/lib/initcpio/install/parabolaiso_kms "${work_dir}/${arch}/airootfs/etc/initcpio/install"
+ cp /usr/lib/initcpio/parabolaiso_shutdown "${work_dir}/${arch}/airootfs/etc/initcpio"
+ cp "${script_path}/mkinitcpio.conf" "${work_dir}/${arch}/airootfs/etc/mkinitcpio-parabolaiso.conf"
+ if [[ "${gpg_key}" ]]; then
+ gpg --export "${gpg_key}" >"${work_dir}/gpgkey"
+ exec 17<>"${work_dir}/gpgkey"
fi
- PARABOLAISO_GNUPG_FD=${gpg_key:+17} setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux-libre -g /boot/parabolaiso.img' run
- if [[ ${gpg_key} ]]; then
+ if [ -n "${verbose}" ]; then
+ PARABOLAISO_GNUPG_FD="${gpg_key:+17}" arch="${arch}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" \
+ -D "${install_dir}" \
+ -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux-libre -g /boot/parabolaiso.img' run
+ else
+ PARABOLAISO_GNUPG_FD="${gpg_key:+17}" arch="${arch}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" \
+ -D "${install_dir}" \
+ -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux-libre -g /boot/parabolaiso.img' run
+ fi
+ if [[ "${gpg_key}" ]]; then
exec 17<&-
fi
}
# Customize installation (airootfs)
make_customize_airootfs() {
- cp -af ${script_path}/airootfs ${work_dir}/${arch}
-
- cp ${script_path}/pacman.conf ${work_dir}/${arch}/airootfs/etc
+ cp -af --no-preserve=ownership "${script_path}/airootfs" "${work_dir}/${arch}"
- curl -o ${work_dir}/${arch}/airootfs/etc/pacman.d/mirrorlist 'https://www.parabola.nu/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
+ cp "${script_path}/pacman.conf" "${work_dir}/${arch}/airootfs/etc"
- lynx -dump -nolist 'https://wiki.parabola.nu/index.php/Installation_Guide?action=render' >> ${work_dir}/${arch}/airootfs/root/install.txt
+ lynx -dump -nolist 'https://wiki.parabola.nu/index.php/Installation_Guide?action=render' >> \
+ "${work_dir}/${arch}/airootfs/root/install.txt"
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -r '/root/customize_airootfs.sh' run
- rm ${work_dir}/${arch}/airootfs/root/customize_airootfs.sh
+ if [ -n "${verbose}" ]; then
+ arch="${arch}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
+ -r '/root/customize_airootfs.sh' run
+ else
+ arch="${arch}" 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"
}
# 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}/parabolaiso.img
- cp ${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-libre ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
+ mkdir -p "${work_dir}/iso/${install_dir}/boot/${arch}"
+ cp "${work_dir}/${arch}/airootfs/boot/parabolaiso.img" "${work_dir}/iso/${install_dir}/boot/${arch}/parabolaiso.img"
+ cp "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-libre" "${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz"
}
# Add other aditional/extra files to ${install_dir}/boot/
make_boot_extra() {
- cp ${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin ${work_dir}/iso/${install_dir}/boot/memtest
- cp ${work_dir}/${arch}/airootfs/usr/share/licenses/common/GPL2/license.txt ${work_dir}/iso/${install_dir}/boot/memtest.COPYING
+ cp "${work_dir}/${arch}/airootfs/boot/memtest86+/memtest.bin" "${work_dir}/iso/${install_dir}/boot/memtest"
+ cp "${work_dir}/${arch}/airootfs/usr/share/licenses/common/GPL2/license.txt" \
+ "${work_dir}/iso/${install_dir}/boot/memtest.COPYING"
}
# 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
+ _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##*/}
+ 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
+ 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"
# inject edition title
sed -i "s|_EDITION_TITLE_|${iso_title}|" ${work_dir}/iso/${install_dir}/boot/syslinux/parabolaiso_head.cfg
@@ -156,83 +179,85 @@ make_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}/${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/
+ 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/share/efitools/efi/PreLoader.efi ${work_dir}/iso/EFI/boot/bootx64.efi
- cp ${work_dir}/x86_64/airootfs/usr/share/efitools/efi/HashTool.efi ${work_dir}/iso/EFI/boot/
-
- cp ${work_dir}/x86_64/airootfs/usr/share/refind/refind_x64.efi ${work_dir}/iso/EFI/boot/loader.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"
- mkdir -p ${work_dir}/iso/EFI/boot/entries
- cp ${script_path}/efiboot/EFI/boot/refind.conf ${work_dir}/iso/EFI/boot/
- cp ${script_path}/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf ${work_dir}/iso/EFI/boot/entries/
+ 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
+ "${script_path}/efiboot/EFI/boot/entries/parabolaiso-x86_64-usb.conf" > \
+ "${work_dir}/iso/EFI/boot/entries/parabolaiso-x86_64.conf"
- # EFI Shell 2.0 for UEFI 2.3+
- curl -o ${work_dir}/iso/EFI/shellx64_v2.efi https://raw.githubusercontent.com/tianocore/edk2/edk2-stable201811/ShellBinPkg/UefiShell/X64/Shell.efi
- # EFI Shell 1.0 for non UEFI 2.3+
- curl -o ${work_dir}/iso/EFI/shellx64_v1.efi https://raw.githubusercontent.com/tianocore/edk2/edk2-stable201811/EdkShellBinPkg/FullShell/X64/Shell_Full.efi
-
- # Checksums for EFI Shell
- sed "s|shellx64|${work_dir}/iso/EFI/shellx64|" ${script_path}/SHA512SUMS | sha512sum --quiet -c -
+ # edk2-shell based UEFI shell
+ # shellx64.efi is picked up automatically when on /
+ cp /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}/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/EFI/parabolaiso
- cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/efiboot/EFI/parabolaiso/vmlinuz.efi
- cp ${work_dir}/iso/${install_dir}/boot/x86_64/parabolaiso.img ${work_dir}/efiboot/EFI/parabolaiso/parabolaiso.img
+ mkdir -p "${work_dir}/efiboot"
+ mount "${work_dir}/iso/EFI/parabolaiso/efiboot.img ${work_dir}/efiboot"
- mkdir -p ${work_dir}/efiboot/EFI/boot
- cp ${work_dir}/x86_64/airootfs/usr/share/efitools/efi/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi
- cp ${work_dir}/x86_64/airootfs/usr/share/efitools/efi/HashTool.efi ${work_dir}/efiboot/EFI/boot/
+ mkdir -p "${work_dir}/efiboot/EFI/parabolaiso"
+ cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz" "${work_dir}/efiboot/EFI/parabolaiso/vmlinuz.efi"
+ cp "${work_dir}/iso/${install_dir}/boot/x86_64/parabolaiso.img" "${work_dir}/efiboot/EFI/parabolaiso/parabolaiso.img"
- cp ${work_dir}/x86_64/airootfs/usr/share/refind/refind_x64.efi ${work_dir}/efiboot/EFI/boot/loader.efi
+ 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"
- mkdir -p ${work_dir}/efiboot/EFI/boot/entries
- cp ${script_path}/efiboot/EFI/boot/refind.conf ${work_dir}/efiboot/EFI/boot/
- cp ${script_path}/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf ${work_dir}/efiboot/EFI/boot/entries/
+ 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
+ "${script_path}/efiboot/EFI/boot/entries/parabolaiso-x86_64-cd.conf" > \
+ "${work_dir}/efiboot/EFI/boot/entries/parabolaiso-x86_64.conf"
- cp ${work_dir}/iso/EFI/shellx64_v2.efi ${work_dir}/efiboot/EFI/
- cp ${work_dir}/iso/EFI/shellx64_v1.efi ${work_dir}/efiboot/EFI/
+ # shellx64.efi is picked up automatically when on /
+ cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
- umount -d ${work_dir}/efiboot
+ umount -d "${work_dir}/efiboot"
}
# Build airootfs filesystem image
make_prepare() {
- cp -a -l -f ${work_dir}/${arch}/airootfs ${work_dir}
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" pkglist
- setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
- rm -rf ${work_dir}/airootfs
- # rm -rf ${work_dir}/${arch}/airootfs (if low space, this helps)
+ cp -a -l -f "${work_dir}/${arch}/airootfs" "${work_dir}"
+ if [ -n "${verbose}" ]; then
+ arch="${arch}" mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" pkglist
+ arch="${arch}" mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
+ else
+ arch="${arch}" mkparabolaiso -w "${work_dir}" -D "${install_dir}" pkglist
+ arch="${arch}" 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() {
- setarch ${arch} mkparabolaiso ${verbose} -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"
+ if [ -n "${verbose}" ]; then
+ arch="${arch}" 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
+ arch="${arch}" 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
@@ -240,11 +265,6 @@ if [[ ${EUID} -ne 0 ]]; then
_usage 1
fi
-if [[ ${arch} != x86_64 ]]; then
- echo "This script needs to be run on x86_64"
- _usage 1
-fi
-
while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do
case "${arg}" in
N) iso_name="${OPTARG}" ;;
@@ -265,7 +285,7 @@ while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do
esac
done
-mkdir -p ${work_dir}
+mkdir -p "${work_dir}"
run_once make_pacman_conf
@@ -275,8 +295,6 @@ for arch in i686 x86_64; do
run_once make_packages
done
-run_once make_packages_efi
-
for arch in i686 x86_64; do
run_once make_setup_mkinitcpio
run_once make_customize_airootfs
diff --git a/configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf b/configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf
deleted file mode 100644
index 19e2164..0000000
--- a/configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-menuentry "UEFI Shell x86_64 v1" {
- loader /EFI/shellx64_v1.efi
-}
-menuentry "UEFI Shell x86_64 v2" {
- loader /EFI/shellx64_v2.efi
-}
diff --git a/configs/lxde-openrc/packages.both b/configs/lxde-openrc/packages.both
index 2b1ede7..0faa899 100644
--- a/configs/lxde-openrc/packages.both
+++ b/configs/lxde-openrc/packages.both
@@ -12,6 +12,7 @@ dmraid
dnsmasq
dnsutils
dosfstools
+efibootmgr
elinks
ethtool
exfat-utils
@@ -21,7 +22,6 @@ gnu-netcat
gpm-openrc
gptfdisk
grml-zsh-config
-grub
hdparm-openrc
irssi
iwd
@@ -29,8 +29,8 @@ jfsutils
lftp
linux-atm
linux-libre-firmware
-lsscsi
lvm2-openrc
+lsscsi
man-db
man-pages
mc
@@ -43,7 +43,7 @@ nfs-utils-openrc
nilfs-utils
nmap
ntfs-3g
-ntp-openrc
+nvme-cli
openconnect
openssh-openrc
openvpn-openrc
@@ -52,9 +52,9 @@ parted
partimage
ppp
pptpclient
-refind-efi
reiserfsprogs
rp-pppoe
+reflector
rsync-openrc
sdparm
sg3_utils
@@ -64,10 +64,8 @@ tcpdump
testdisk
usb_modeswitch
usbutils
-vi
vim-minimal
vpnc
-wget
wireless-regdb
wireless_tools
wpa_supplicant-openrc
diff --git a/configs/lxde-openrc/syslinux/parabolaiso_head.cfg b/configs/lxde-openrc/syslinux/parabolaiso_head.cfg
index 8267a7a..aa6f03c 100644
--- a/configs/lxde-openrc/syslinux/parabolaiso_head.cfg
+++ b/configs/lxde-openrc/syslinux/parabolaiso_head.cfg
@@ -23,3 +23,5 @@ MENU COLOR timeout_msg 35;40 #ff777caa #00000000 std
MENU COLOR timeout 1;35;40 #ff777caa #00000000 std
MENU COLOR msg07 35;40 #ff777caa #a0000000 std
MENU COLOR tabmsg 35;40 #ff777caa #00000000 std
+
+MENU CLEAR