diff --git a/scripts/main.sh b/scripts/main.sh index 69a4d7b..4b75333 100644 --- a/scripts/main.sh +++ b/scripts/main.sh @@ -369,7 +369,7 @@ function main_install() { [[ $IS_EFI == "true" ]] \ && mount_efivars - gentoo_chroot "$ROOT_MOUNTPOINT" "$GENTOO_INSTALL_REPO_BIND/scripts/main.sh" __install_gentoo_in_chroot + gentoo_chroot "$ROOT_MOUNTPOINT" "$GENTOO_INSTALL_REPO_BIND/install" __install_gentoo_in_chroot gentoo_umount } diff --git a/scripts/utils.sh b/scripts/utils.sh index 5f89a29..b09d602 100644 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -176,7 +176,7 @@ function cache_lsblk_output() { function get_device_by_ptuuid() { local ptuuid="${1,,}" local dev - if [[ -v CACHED_LSBLK_OUTPUT ]]; then + if [[ -v CACHED_LSBLK_OUTPUT && -n "$CACHED_LSBLK_OUTPUT" ]]; then dev="$CACHED_LSBLK_OUTPUT" else dev="$(lsblk --all --path --pairs --output NAME,PTUUID,PARTUUID)" \