diff --git a/usr/lib/archboot/installer/mountpoints.sh b/usr/lib/archboot/installer/mountpoints.sh
index ad4c62575..7b2513167 100644
--- a/usr/lib/archboot/installer/mountpoints.sh
+++ b/usr/lib/archboot/installer/mountpoints.sh
@@ -121,8 +121,17 @@ _run_mkfs() {
_LABEL_NAME=$(echo "${line}" | cut -d '|' -f 5)
_FS_OPTIONS=$(echo "${line}" | cut -d '|' -f 6)
[[ "${_FS_OPTIONS}" == "NONE" ]] && _FS_OPTIONS=""
- # bcachefs and btrfs parameters
- if [[ ${_FSTYPE} == "btrfs" ]]; then
+ # bcachefs, btrfs and other parameters
+ if [[ ${_FSTYPE} == "bcachefs" ]]; then
+ _BCACHEFS_COMPRESS=$(echo "${line}" | cut -d '|' -f 7)
+ if [[ "${_BCACHEFS_COMPRESS}" == "NONE" ]];then
+ _BCACHEFS_COMPRESS=""
+ else
+ _BCACHEFS_COMPRESS="--compression=${_BCACHEFS_COMPRESS}"
+ fi
+ _mkfs "${_DEV}" "${_FSTYPE}" "${_DESTDIR}" "${_DOMKFS}" "${_MP}" "${_LABEL_NAME}" "${_FS_OPTIONS}" \
+ "${_BCACHEFS_COMPRESS}" || return 1
+ elif [[ ${_FSTYPE} == "btrfs" ]]; then
_BTRFS_DEVS=$(echo "${line}" | cut -d '|' -f 7)
# remove # from array
_BTRFS_DEVS="${_BTRFS_DEVS//#/\ }"
@@ -134,15 +143,6 @@ _run_mkfs() {
[[ "${_BTRFS_COMPRESS}" == "NONE" ]] && _BTRFS_COMPRESS=""
_mkfs "${_DEV}" "${_FSTYPE}" "${_DESTDIR}" "${_DOMKFS}" "${_MP}" "${_LABEL_NAME}" "${_FS_OPTIONS}" \
"${_BTRFS_DEVS}" "${_BTRFS_LEVEL}" "${_BTRFS_SUBVOLUME}" "${_BTRFS_COMPRESS}" || return 1
- elif [[ ${_FSTYPE} == "bcachefs" ]]; then
- _BCACHEFS_COMPRESS=$(echo "${line}" | cut -d '|' -f 7)
- if [[ "${_BCACHEFS_COMPRESS}" == "NONE" ]];then
- _BCACHEFS_COMPRESS=""
- else
- _BCACHEFS_COMPRESS="--compression=${_BCACHEFS_COMPRESS}"
- fi
- _mkfs "${_DEV}" "${_FSTYPE}" "${_DESTDIR}" "${_DOMKFS}" "${_MP}" "${_LABEL_NAME}" "${_FS_OPTIONS}" \
- "${_BCACHEFS_COMPRESS}" || return 1
else
_mkfs "${_DEV}" "${_FSTYPE}" "${_DESTDIR}" "${_DOMKFS}" "${_MP}" "${_LABEL_NAME}" "${_FS_OPTIONS}" || return 1
fi
diff --git a/usr/lib/archboot/installer/quicksetup.sh b/usr/lib/archboot/installer/quicksetup.sh
index ade945026..14f30aba5 100644
--- a/usr/lib/archboot/installer/quicksetup.sh
+++ b/usr/lib/archboot/installer/quicksetup.sh
@@ -86,17 +86,18 @@ _auto_create_filesystems() {
_BTRFS_LEVEL=""
_BTRFS_SUBVOLUME=""
_BTRFS_COMPRESS=""
- if [[ "${_FSTYPE}" == "btrfs" ]]; then
+ # bcachefs, btrfs and other parameters
+ if [[ "${_FSTYPE}" == "bcachefs" ]]; then
+ _BCACHEFS_COMPRESS="--compression=zstd"
+ _mkfs "${_DEV}" "${_FSTYPE}" "${_DESTDIR}" "${_DOMKFS}" "${_MP}" "${_LABEL_NAME}" "${_FS_OPTIONS}" \
+ "${_BCACHEFS_COMPRESS}" || return 1
+ elif [[ "${_FSTYPE}" == "btrfs" ]]; then
_BTRFS_DEVS="${_DEV}"
[[ "${_MP}" == "/" ]] && _BTRFS_SUBVOLUME="root"
[[ "${_MP}" == "/home" ]] && _BTRFS_SUBVOLUME="home"
_BTRFS_COMPRESS="compress=zstd"
_mkfs "${_DEV}" "${_FSTYPE}" "${_DESTDIR}" "${_DOMKFS}" "${_MP}" "${_LABEL_NAME}" "${_FS_OPTIONS}" \
"${_BTRFS_DEVS}" "${_BTRFS_LEVEL}" "${_BTRFS_SUBVOLUME}" "${_BTRFS_COMPRESS}" || return 1
- elif [[ "${_FSTYPE}" == "bcachefs" ]]; then
- _BCACHEFS_COMPRESS="--compression=zstd"
- _mkfs "${_DEV}" "${_FSTYPE}" "${_DESTDIR}" "${_DOMKFS}" "${_MP}" "${_LABEL_NAME}" "${_FS_OPTIONS}" \
- "${_BCACHEFS_COMPRESS}" || return 1
else
_mkfs "${_DEV}" "${_FSTYPE}" "${_DESTDIR}" "${_DOMKFS}" "${_MP}" "${_LABEL_NAME}" "${_FS_OPTIONS}" || return 1
fi
diff --git a/usr/share/archboot/doc/archboot.html b/usr/share/archboot/doc/archboot.html
index 8583ee2db..aa1f31a8e 100644
--- a/usr/share/archboot/doc/archboot.html
+++ b/usr/share/archboot/doc/archboot.html
@@ -550,7 +550,7 @@
Persistent block device naming support: PARTUUID, PARTLABEL, UUID, LABEL and KERNEL
Creation of software RAID/RAID partitions, LVM devices and LUKS encrypted devices
Supports standard linux, RAID/RAID_partitions, dmraid/fakeraid, LVM and LUKS encrypted devices
-Filesystem support: BCACHEFS, BTRFS, EXT2/4, XFS, VFAT
+Filesystem support: BCACHEFS, BTRFS, Ext2/4, XFS, VFAT
Install Packages