From b10bcd9ca5da4071b0d6776a03de214eb98d63fa Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Thu, 12 Jan 2023 12:03:50 +0100 Subject: [PATCH] fix mount options --- usr/lib/archboot/installer/mountpoints.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/usr/lib/archboot/installer/mountpoints.sh b/usr/lib/archboot/installer/mountpoints.sh index 04309a361..4c13ef0bd 100644 --- a/usr/lib/archboot/installer/mountpoints.sh +++ b/usr/lib/archboot/installer/mountpoints.sh @@ -306,20 +306,21 @@ _mkfs() { # add ssd optimization before mounting _ssd_optimization _MOUNTOPTIONS="" + _F2FS_MOUNTOPTIONS="" ### 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_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. # 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 [[ -n "${10}" ]] && _MOUNTOPTIONS="${_MOUNTOPTIONS} subvol=${10}" [[ -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 , - _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 -t "${2}" -o "${_MOUNTOPTIONS}" "${1}" "${3}""${5}" >"${_LOG}" 2>&1 + mount -t "${2}" "${_MOUNTOPTIONS}" "${1}" "${3}""${5}" >"${_LOG}" 2>&1 #shellcheck disable=SC2181 if [[ $? != 0 ]]; then _dialog --msgbox "Error mounting ${3}${5}" 0 0