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

_FSTYPE is already defines

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-10 07:34:07 +01:00
parent 9622330a9d
commit baaa7f6633
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -169,10 +169,12 @@ _mountpoints() {
# clear values first! # clear values first!
_clear_fs_values _clear_fs_values
_check_btrfs_filesystem_creation _check_btrfs_filesystem_creation
# _ASK_MOUNTPOINTS switch for create filesystem and only mounting filesystem
# _SKIP_FILESYSTEM for btrfs
if [[ -n "${_ASK_MOUNTPOINTS}" && -z "${_SKIP_FILESYSTEM}" ]]; then if [[ -n "${_ASK_MOUNTPOINTS}" && -z "${_SKIP_FILESYSTEM}" ]]; then
_select_filesystem && _create_filesystem && _btrfs_subvolume _select_filesystem && _create_filesystem && _btrfs_subvolume
else else
if [[ "$(${_LSBLK} FSTYPE ${_PART_ROOT})" == "btrfs" ]]; then if [[ "${_FSTYPE}" == "btrfs" ]]; then
_FSTYPE="btrfs" _FSTYPE="btrfs"
_SKIP_FILESYSTEM=1 _SKIP_FILESYSTEM=1
_btrfs_subvolume _btrfs_subvolume
@ -200,18 +202,19 @@ _mountpoints() {
# clear values first! # clear values first!
_clear_fs_values _clear_fs_values
_check_btrfs_filesystem_creation _check_btrfs_filesystem_creation
# Select a filesystem type # _ASK_MOUNTPOINTS switch for create filesystem and only mounting filesystem
# _SKIP_FILESYSTEM for btrfs
if [[ -n "${_ASK_MOUNTPOINTS}" && -z "${_SKIP_FILESYSTEM}" ]]; then if [[ -n "${_ASK_MOUNTPOINTS}" && -z "${_SKIP_FILESYSTEM}" ]]; then
_enter_mountpoint && _select_filesystem && _create_filesystem && _btrfs_subvolume _enter_mountpoint && _select_filesystem && _create_filesystem && _btrfs_subvolume
else else
_enter_mountpoint _enter_mountpoint
if [[ "$(${_LSBLK} FSTYPE ${_PART})" == "btrfs" ]]; then if [[ "${_FSTYPE}" == "btrfs" ]]; then
_FSTYPE="btrfs" _FSTYPE="btrfs"
_SKIP_FILESYSTEM=1 _SKIP_FILESYSTEM=1
_btrfs_subvolume _btrfs_subvolume
fi fi
fi fi
_find_btrfs_raid_devices _find_btrfs_raid_devices
_btrfs_parts _btrfs_parts
_check_mkfs_values _check_mkfs_values
echo "${_PART}:${_FSTYPE}:${_MP}:${_DOMKFS}:${_LABEL_NAME}:${_FS_OPTIONS}:${_BTRFS_DEVICES}:${_BTRFS_LEVEL}:${_BTRFS_SUBVOLUME}:${_DOSUBVOLUME}:${_BTRFS_COMPRESS}" >>/tmp/.parts echo "${_PART}:${_FSTYPE}:${_MP}:${_DOMKFS}:${_LABEL_NAME}:${_FS_OPTIONS}:${_BTRFS_DEVICES}:${_BTRFS_LEVEL}:${_BTRFS_SUBVOLUME}:${_DOSUBVOLUME}:${_BTRFS_COMPRESS}" >>/tmp/.parts