|
|
@ -245,7 +245,7 @@ select_filesystem() {
|
|
|
|
"ntfs" "mkfs.ntfs -q" \
|
|
|
|
"ntfs" "mkfs.ntfs -q" \
|
|
|
|
"reiserfs" "mkfs.reiserfs -q" \
|
|
|
|
"reiserfs" "mkfs.reiserfs -q" \
|
|
|
|
"vfat" "mkfs.vfat -F32" \
|
|
|
|
"vfat" "mkfs.vfat -F32" \
|
|
|
|
"xfs" "mkfs.xfs -f" 2>${ANSWER}
|
|
|
|
"xfs" "mkfs.xfs -f" 2>${ANSWER} || return 1
|
|
|
|
|
|
|
|
|
|
|
|
case $(cat ${ANSWER}) in
|
|
|
|
case $(cat ${ANSWER}) in
|
|
|
|
"$_FSSkip") FILESYSTEM="$_FSSkip"
|
|
|
|
"$_FSSkip") FILESYSTEM="$_FSSkip"
|
|
|
@ -290,7 +290,7 @@ select_filesystem() {
|
|
|
|
CHK_NUM=9
|
|
|
|
CHK_NUM=9
|
|
|
|
fs_opts="discard filestreams ikeep largeio noalign nobarrier norecovery noquota wsync"
|
|
|
|
fs_opts="discard filestreams ikeep largeio noalign nobarrier norecovery noquota wsync"
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
*) return 0
|
|
|
|
*) return 1
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
@ -836,11 +836,8 @@ mount_partitions() {
|
|
|
|
PARTITION=$(cat ${ANSWER})
|
|
|
|
PARTITION=$(cat ${ANSWER})
|
|
|
|
ROOT_PART=${PARTITION}
|
|
|
|
ROOT_PART=${PARTITION}
|
|
|
|
|
|
|
|
|
|
|
|
# Format with FS (or skip)
|
|
|
|
# Format with FS (or skip) -> # Make the directory and mount. Also identify LUKS and/or LVM
|
|
|
|
select_filesystem
|
|
|
|
select_filesystem && mount_current_partition || return 0
|
|
|
|
|
|
|
|
|
|
|
|
# Make the directory and mount. Also identify LUKS and/or LVM
|
|
|
|
|
|
|
|
mount_current_partition
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Identify and create swap, if applicable
|
|
|
|
# Identify and create swap, if applicable
|
|
|
|
make_swap
|
|
|
|
make_swap
|
|
|
|