root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix mount options

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-12 12:03:50 +01:00
parent 7f5bba59e3
commit b10bcd9ca5
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
usr/lib/archboot/installer/mountpoints.sh
View file

@ -306,20 +306,21 @@ _mkfs() {
# add ssd optimization before mounting # add ssd optimization before mounting
_ssd_optimization _ssd_optimization
_MOUNTOPTIONS="" _MOUNTOPTIONS=""
_F2FS_MOUNTOPTIONS=""
### f2fs mount options, taken from wiki: ### f2fs mount options, taken from wiki:
# compress_algorithm=zstd:6 tells F2FS to use zstd for compression at level 6, which should give pretty good compression ratio. # compress_algorithm=zstd:6 tells F2FS to use zstd for compression at level 6, which should give pretty good compression ratio.
# compress_chksum tells the filesystem to verify compressed blocks with a checksum (to avoid corruption) # compress_chksum tells the filesystem to verify compressed blocks with a checksum (to avoid corruption)
# atgc,gc_merge Enable better garbage collector, and enable some foreground garbage collections to be asynchronous. # atgc,gc_merge Enable better garbage collector, and enable some foreground garbage collections to be asynchronous.
# lazytime Do not synchronously update access or modification times. Improves IO performance and flash durability. # lazytime Do not synchronously update access or modification times. Improves IO performance and flash durability.
[[ "${2}" == "f2fs" ]] && _MOUNTOPTIONS="compress_algorithm=zstd:6,compress_chksum,atgc,gc_merge,lazytime" [[ "${2}" == "f2fs" ]] && _F2FS_MOUNTOPTIONS="compress_algorithm=zstd:6,compress_chksum,atgc,gc_merge,lazytime"
# prepare btrfs mount options # prepare btrfs mount options
[[ -n "${10}" ]] && _MOUNTOPTIONS="${_MOUNTOPTIONS} subvol=${10}" [[ -n "${10}" ]] && _MOUNTOPTIONS="${_MOUNTOPTIONS} subvol=${10}"
[[ -n "${12}" ]] && _MOUNTOPTIONS="${_MOUNTOPTIONS} ${12}" [[ -n "${12}" ]] && _MOUNTOPTIONS="${_MOUNTOPTIONS} ${12}"
_MOUNTOPTIONS="${_MOUNTOPTIONS} ${_SSD_MOUNT_OPTIONS}" _MOUNTOPTIONS="${_MOUNTOPTIONS} ${_SSD_MOUNT_OPTIONS} ${_F2FS_MOUNTOPTIONS}"
# eleminate spaces at beginning and end, replace other spaces with , # eleminate spaces at beginning and end, replace other spaces with ,
_MOUNTOPTIONS="$(echo "${_MOUNTOPTIONS}" | sed -e 's#^ *##g' -e 's# *$##g' | sed -e 's# #,#g')" _MOUNTOPTIONS="-o $(echo "${_MOUNTOPTIONS}" | sed -e 's#^ *##g' -e 's# *$##g' | sed -e 's# #,#g')"
# mount the bad boy # mount the bad boy
mount -t "${2}" -o "${_MOUNTOPTIONS}" "${1}" "${3}""${5}" >"${_LOG}" 2>&1 mount -t "${2}" "${_MOUNTOPTIONS}" "${1}" "${3}""${5}" >"${_LOG}" 2>&1
#shellcheck disable=SC2181 #shellcheck disable=SC2181
if [[ $? != 0 ]]; then if [[ $? != 0 ]]; then
_dialog --msgbox "Error mounting ${3}${5}" 0 0 _dialog --msgbox "Error mounting ${3}${5}" 0 0