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

fix systemd-1 mounts

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-22 20:10:00 +01:00
parent bc620c4c31
commit ad49c06445
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
usr/lib/archboot/installer/bootloader.sh
View file

@ -287,7 +287,11 @@ _do_efistub_parameters() {
_FAIL_COMPLEX=""
_RAID_ON_LVM=""
_UEFISYS_PATH="EFI/archlinux"
_BOOTDEV="$(findmnt -vno SOURCE "${_DESTDIR}/boot")"
_BOOTDEV="$(findmnt -vno SOURCE "${_DESTDIR}/boot" | grep -vw 'systemd-1')"
if [[ -z "${_BOOTDEV}" ]]; then
ls "${_DESTDIR}/${_UEFISYS_MP}" &>"${_NO_LOG}"
_BOOTDEV="$(findmnt -vno SOURCE "${_DESTDIR}/boot}" | grep -vw 'systemd-1')"
fi
_UEFISYSDEV="$(findmnt -vno SOURCE "${_DESTDIR}/${_UEFISYS_MP}" | grep -vw 'systemd-1')"
# automounted /boot needs to be mounted first
if [[ -z "${_UEFISYSDEV}" ]]; then

5
usr/lib/archboot/installer/partition.sh
View file

@ -2,7 +2,10 @@
# created by Tobias Powalowski <tpowa@archlinux.org>
_detect_disk() {
if [[ -z "${_DISK}" ]] || ! echo "${_DISK}" | grep -q '/dev/'; then
_DISK="$(${_LSBLK} PKNAME "$(findmnt -vno SOURCE "${_DESTDIR}/boot")")"
if [[ -z "$(findmnt -vno SOURCE "${_DESTDIR}/boot" | grep -vw systemd-1)" ]]; then
ls "${_DESTDIR}/boot" &>"${_NO_LOG}"
fi
_DISK="$(${_LSBLK} PKNAME "$(findmnt -vno SOURCE "${_DESTDIR}/boot" | grep -vw systemd-1)")"
fi
if [[ -z "${_DISK}" ]]; then
_DISK="$(${_LSBLK} PKNAME "$(findmnt -vno SOURCE "${_DESTDIR}/")")"