From aa18ed47940ee4a8d1866b401921c57886c2a932 Mon Sep 17 00:00:00 2001
From: Bernhard Landauer <oberon@manjaro.org>
Date: Mon, 27 Feb 2017 05:03:17 +0100
Subject: [PATCH] mount_current_partition: catch output in log at least

---
 lib/util-desktop.sh | 4 ++--
 lib/util-disk.sh    | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/util-desktop.sh b/lib/util-desktop.sh
index 2d6a771..04495bf 100644
--- a/lib/util-desktop.sh
+++ b/lib/util-desktop.sh
@@ -292,7 +292,7 @@ install_manjaro_de_wm_pkg() {
     PROFILES="/usr/share/manjaro-tools/iso-profiles"
     # Only show this information box once
     if [[ $SHOW_ONCE -eq 0 ]]; then
-        DIALOG " $_InstDETitle " --msgbox "\n$_InstPBody\n" 0 0
+        DIALOG " $_InstDETitle " --msgbox "\n$_InstPBody\n\n" 0 0
         SHOW_ONCE=1
     fi
     clear
@@ -310,7 +310,7 @@ install_manjaro_de_wm_git() {
     PROFILES="$DATADIR/profiles"
     # Only show this information box once
     if [[ $SHOW_ONCE -eq 0 ]]; then
-        DIALOG " $_InstDETitle " --msgbox "$_InstPBody" 0 0
+        DIALOG " $_InstDETitle " --msgbox "\n$_InstPBody\n\n" 0 0
         SHOW_ONCE=1
     fi
     clear
diff --git a/lib/util-disk.sh b/lib/util-disk.sh
index 817c62e..1b57e56 100644
--- a/lib/util-disk.sh
+++ b/lib/util-disk.sh
@@ -316,15 +316,16 @@ mount_partitions() {
     mount_current_partition() {
         # Make the mount directory
         mkdir -p ${MOUNTPOINT}${MOUNT} 2>$ERR
+        check_for_error "create mountpoint" "$?"
 
         # Get mounting options for appropriate filesystems
         [[ $fs_opts != "" ]] && mount_opts
 
         # Use special mounting options if selected, else standard mount
         if [[ $(cat ${MOUNT_OPTS}) != "" ]]; then
-            mount -o $(cat ${MOUNT_OPTS}) ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$ERR
+            mount -o $(cat ${MOUNT_OPTS}) ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$LOGFILE
         else
-            mount ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$ERR
+            mount ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$LOGFILE
         fi
         check_for_error "mount -o $(cat ${MOUNT_OPTS}) ${PARTITION} ${MOUNTPOINT}${MOUNT}"
         confirm_mount ${MOUNTPOINT}${MOUNT}