Archives/manjaro-architect
2
0
Fork 0
mirror of https://gitlab.manjaro.org/applications/manjaro-architect synced 2024-11-08 01:10:26 +00:00
Code Issues Projects Releases Wiki Activity

mount_current_partition: catch output in log at least

Browse Source
This commit is contained in:
Bernhard Landauer 2017-02-27 05:03:17 +01:00
parent 8aeef6c45d
commit aa18ed4794
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/util-desktop.sh
View File

@ -292,7 +292,7 @@ install_manjaro_de_wm_pkg() {
PROFILES="/usr/share/manjaro-tools/iso-profiles" PROFILES="/usr/share/manjaro-tools/iso-profiles"
# Only show this information box once # Only show this information box once
if [[ $SHOW_ONCE -eq 0 ]]; then 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 SHOW_ONCE=1
fi fi
clear clear
@ -310,7 +310,7 @@ install_manjaro_de_wm_git() {
PROFILES="$DATADIR/profiles" PROFILES="$DATADIR/profiles"
# Only show this information box once # Only show this information box once
if [[ $SHOW_ONCE -eq 0 ]]; then if [[ $SHOW_ONCE -eq 0 ]]; then
DIALOG " $_InstDETitle " --msgbox "$_InstPBody" 0 0 DIALOG " $_InstDETitle " --msgbox "\n$_InstPBody\n\n" 0 0
SHOW_ONCE=1 SHOW_ONCE=1
fi fi
clear clear

5
lib/util-disk.sh
View File

@ -316,15 +316,16 @@ mount_partitions() {
mount_current_partition() { mount_current_partition() {
# Make the mount directory # Make the mount directory
mkdir -p ${MOUNTPOINT}${MOUNT} 2>$ERR mkdir -p ${MOUNTPOINT}${MOUNT} 2>$ERR
check_for_error "create mountpoint" "$?"
# Get mounting options for appropriate filesystems # Get mounting options for appropriate filesystems
[[ $fs_opts != "" ]] && mount_opts [[ $fs_opts != "" ]] && mount_opts
# Use special mounting options if selected, else standard mount # Use special mounting options if selected, else standard mount
if [[ $(cat ${MOUNT_OPTS}) != "" ]]; then 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 else
mount ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$ERR mount ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$LOGFILE
fi fi
check_for_error "mount -o $(cat ${MOUNT_OPTS}) ${PARTITION} ${MOUNTPOINT}${MOUNT}" check_for_error "mount -o $(cat ${MOUNT_OPTS}) ${PARTITION} ${MOUNTPOINT}${MOUNT}"
confirm_mount ${MOUNTPOINT}${MOUNT} confirm_mount ${MOUNTPOINT}${MOUNT}