summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/diskdrake/interactive.pm2
-rw-r--r--perl-install/fs/format.pm7
2 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 453594087..7f0f49402 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -424,7 +424,7 @@ sub part_possible_actions {
my %macros = (
readonly => '$hd->{readonly}',
hasMntpoint => '$part->{mntpoint}',
- LVM_resizable => 'member($part->{fs_type}, qw(reiserfs xfs ext3 ext4))',
+ LVM_resizable => 'member($part->{fs_type}, qw(reiserfs xfs ext3 ext4 btrfs))',
canModifyRAID => 'isPartOfRAID($part) && !isMounted(fs::get::device2part($part->{raid}, $all_hds->{raids}))',
);
if (isEmpty($part)) {
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index e50cf492a..94592bdbe 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -24,6 +24,7 @@ my %cmds = (
swap => [ 'util-linux-ng', 'mkswap' ],
ntfs => [ 'ntfsprogs', 'mkntfs', '--fast' ],
'ntfs-3g' => [ 'ntfsprogs', 'mkntfs', '--fast' ],
+ btrfs => [ 'btrfs-progs', 'mkfs.btrfs' ],
);
my %LABELs = ( #- option, length, handled_by_mount
@@ -40,6 +41,7 @@ my %LABELs = ( #- option, length, handled_by_mount
swap => [ '-L', 15, 1 ],
ntfs => [ '-L', 128, 0 ],
'ntfs-3g' => [ '-L', 128, 0 ],
+ btrfs => [ '-L', 256, 1 ],
);
my %edit_LABEL = ( # package, command, option
@@ -58,6 +60,7 @@ my %edit_LABEL = ( # package, command, option
# swap => [ 'util-linux-ng', 'mkswap' ],
ntfs => [ 'ntfsprogs', 'ntfslabel' ],
'ntfs-3g' => [ 'ntfsprogs', 'ntfslabel' ],
+# btrfs
);
sub package_needed_for_partition_type {
@@ -181,7 +184,9 @@ sub part_raw {
run_program::raw('jfs_tune', '-U', devices::make($dev));
} elsif ($fs_type eq 'xfs') {
run_program::raw('xfs_admin', '-U', devices::make($dev));
- }
+ } elsif ($fs_type eq 'btrfs') {
+ #FIXME
+ }
if (member($fs_type, qw(ext3 ext4))) {
disable_forced_fsck($dev);