root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

shellcheck fixes

Browse source
This commit is contained in:
Tobias Powalowski 2024-04-10 14:14:35 +02:00
parent 02a266d10f
commit 763715f893
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/lib/archboot/installer/bootloader_limine.sh
View file

@ -10,7 +10,7 @@ _limine_common() {
}
_limine_config() {
_PARTN="$(${_LSBLK} PARTN ${_BOOTDEV})"
_PARTN="$(${_LSBLK} PARTN "${_BOOTDEV}")"
cat << CONFEOF > "${_LIMINE_CONFIG}"
TIMEOUT=5

2
usr/lib/archboot/installer/bootloader_refind.sh
View file

@ -21,7 +21,7 @@ resolution 1024 768
scanfor manual,internal,external,optical,firmware
menuentry "Arch Linux" {
icon /EFI/refind/icons/os_arch.png
volume $(${_LSBLK} PARTUUID ${_BOOTDEV})
volume $(${_LSBLK} PARTUUID "${_BOOTDEV}")
loader /${_VMLINUZ}
initrd /${_INITRAMFS}
options "${_KERNEL_PARAMS_MOD}"

3
usr/lib/archboot/installer/bootloader_systemd_bootd.sh
View file

@ -20,8 +20,7 @@ BOOTDEOF
_chroot_mount
# systemd-boot https://www.freedesktop.org/software/systemd/man/latest/systemd-gpt-auto-generator.html
# /boot XBOOTLDR in vfat format can be booted by systemd-boot
if [[ "${_UEFISYS_MP}" == "efi" && \
$(${_LSBLK} FSTYPE "${_BOOTDEV}" 2>"${_NO_LOG}" | grep -q "vfat") ]]; then
if [[ "${_UEFISYS_MP}" == "efi" ]] && ${_LSBLK} FSTYPE "${_BOOTDEV}" 2>"${_NO_LOG}" | grep -q "vfat"; then
chroot "${_DESTDIR} "bootctl --esp-path=/efi --boot-path=/boot install &>"${_LOG}"
chroot "${_DESTDIR}" bootctl --esp-path=/efi --boot-path=/boot update &>"${_LOG}"
else

2
usr/lib/archboot/installer/bootloader_uki.sh
View file

@ -45,7 +45,7 @@ _uki_uefi() {
_geteditor || return 1
"${_EDITOR}" "${_CMDLINE}"
"${_EDITOR}" "${_UKIFY_CONFIG}"
${_NSPAWN} /usr/lib/systemd/ukify build --config=/etc/ukify.conf --output ${_UEFISYS_MP}/EFI/Linux/archlinux-linux.efi >>"${_LOG}"
${_NSPAWN} /usr/lib/systemd/ukify build --config=/etc/ukify.conf --output "${_UEFISYS_MP}"/EFI/Linux/archlinux-linux.efi >>"${_LOG}"
if [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/Linux/archlinux-linux.efi" ]]; then
_uki_install | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Setting up Unified Kernel Image..." 6 75 0
else