diff options
Diffstat (limited to 'src/core/libs/lib-blockdevices-filesystems.sh')
| -rw-r--r-- | src/core/libs/lib-blockdevices-filesystems.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 5b078a7..7d7a826 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -73,7 +73,7 @@ fs_on[lvm-pv]=${fs_on_lvm_pv[@]} fs_on[lvm-vg]=${fs_on_lvm_vg[@]} fs_on[dm_crypt]=${fs_on_dm_crypt[@]} -fs_mountable=(ext2 ext3 ext4 nilfs2 xfs jfs vfat reiserfs) +fs_mountable=(btrfs ext2 ext3 ext4 nilfs2 xfs jfs vfat reiserfs) fs_label_mandatory=('lvm-vg' 'lvm-lv' 'dm_crypt') fs_label_optional=('swap' 'ext2' 'ext3' 'ext4' 'reiserfs' 'nilfs2' 'xfs' 'jfs' 'vfat') @@ -94,7 +94,8 @@ get_possible_fs () { true } -supported_bootloaders=('grub') +syslinux_supported_fs=('ext2' 'ext3' 'ext4' 'btrfs' 'vfat') +supported_bootloaders=('syslinux' 'grub') # procedural code from quickinst functionized and fixed. # there were functions like this in the setup script too, with some subtle differences. see below @@ -244,8 +245,10 @@ finddisks() { } -# find usable blockdevices, both partionable or not (i.e. partitions themselves) -# $1 extra things to echo for each partition (optional) (backslash escapes will get interpreted) +# find usable blockdevices: RAID + LVM volumes, partitioned and unpartitioned devices +# Exclude devices/partitions that are part of a RAID or LVM volume +# Exclude root block devices (ex. sda) that are partitioned +# $1 extra things to echo for each device (optional) (backslash escapes will get interpreted) find_usable_blockdevices() { shopt -s nullglob @@ -573,7 +576,7 @@ process_filesystems () done < $TMP_FILESYSTEMS [ $open_items -eq 0 ] && break done - [ $open_items -eq 1 ] && show_warning "Filesystem/blockdevice processor problem" "Warning: Could not create all needed filesystems. Either the underlying blockdevices didn't became available in 10 iterations, or process_filesystem failed" && returncode=1 + [ $open_items -eq 1 ] && show_warning "Filesystem/blockdevice processor problem" "Warning: Could not create all needed filesystems. Either the underlying blockdevices didn't appear in 10 iterations, or process_filesystem failed" && returncode=1 |