mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
fix systemd-1 mounts
This commit is contained in:
parent
bc620c4c31
commit
ad49c06445
2 changed files with 9 additions and 2 deletions
|
@ -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
|
||||
|
|
|
@ -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}/")")"
|
||||
|
|
Loading…
Reference in a new issue