From 5593144e037542acb4a1d08dd76f20f62725ce95 Mon Sep 17 00:00:00 2001 From: Evan James Date: Thu, 27 Dec 2018 18:45:39 -0600 Subject: [PATCH] Non-block device support for filesystems check --- lib/util.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/util.sh b/lib/util.sh index 8a3c018..632a0a8 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -328,7 +328,7 @@ select_language() { CURR_LOCALE="uk_UA.UTF-8" KEYMAP="ua" fl="u" - + ;; *) clear && exit 0 ;; esac @@ -467,7 +467,7 @@ arch_chroot() { # Ensure that a partition is mounted check_mount() { - if [[ $(lsblk -o MOUNTPOINT | grep ${MOUNTPOINT}) == "" ]]; then + if [[ $(findmnt --list -o TARGET | grep ${MOUNTPOINT}) == "" ]]; then DIALOG " $_ErrTitle " --msgbox "\n$_ErrNoMount\n " 0 0 ANSWER=0 HIGHLIGHT=0 @@ -572,7 +572,7 @@ final_check() { } exit_done() { - if [[ $(lsblk -o MOUNTPOINT | grep ${MOUNTPOINT} 2>/dev/null) != "" ]]; then + if [[ $(findmnt --list -o TARGET | grep ${MOUNTPOINT} 2>/dev/null) != "" ]]; then final_check dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "$(printf "\n$_CloseInstBody\n$(cat ${CHECKLIST})\n ")" 20 40 if [[ $? -eq 0 ]]; then