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

Reverse changes meant to improve f2fs support because of the regressions in mounting

Browse Source 
without formatting.
This commit is contained in:
Chrysostomus 2017-02-26 19:26:08 +08:00
parent ce843e200d
commit 09ae183bf6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/util-disk.sh
View File

@ -196,7 +196,7 @@ create_partitions() {
"reiserfs" "mkfs.reiserfs -q" \
"vfat" "mkfs.vfat -F32" \
"xfs" "mkfs.xfs -f" 2>${ANSWER}
cat ${ANSWER} > /tmp/.fs
case $(cat ${ANSWER}) in
"$_FSSkip") FILESYSTEM="$_FSSkip"
;;
@ -290,9 +290,9 @@ mount_partitions() {
# Use special mounting options if selected, else standard mount
if [[ $(cat ${MOUNT_OPTS}) != "" ]]; then
mount -t $(cat /tmp/.fs) -o $(cat ${MOUNT_OPTS}) ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$ERR
mount -o $(cat ${MOUNT_OPTS}) ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$ERR
else
mount -t $(cat /tmp/.fs) ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$ERR
mount ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$ERR
fi
check_for_error "$FUNCNAME" "$?"