diff options
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/fs/format.pm | 5 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 0be5447db..cf652c242 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,7 +1,7 @@ - add support for XZ modules - diskdrake: o enable to set LV names when not in expert mode - o enable to set label on nilfs fses + o enable to set label on btrfs & nilfs fses o report back error from lvm2 o suggest better LV names based on the mount point rather than numbers diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm index 78f88c9dc..5fd0a76f9 100644 --- a/perl-install/fs/format.pm +++ b/perl-install/fs/format.pm @@ -62,7 +62,7 @@ my %edit_LABEL = ( # package, command, option # swap => [ 'util-linux', 'mkswap' ], ntfs => [ 'ntfsprogs', 'ntfslabel' ], 'ntfs-3g' => [ 'ntfsprogs', 'ntfslabel' ], -# btrfs + btrfs => [ 'btrfs-progs', 'btrfs', 'filesystem', 'label' ], nilfs2 => [ 'nilfs-utils', 'nilfs-tune', '-L' ], ); @@ -126,6 +126,9 @@ sub write_label { my @args; if ($cmd eq 'mlabel') { @args = ($cmd, @first_options, devices::make($dev), '::' . $part->{device_LABEL}); + } elsif ($cmd eq 'btrfs') { + # btrfs needs reverse ordering + @args = ($cmd, @first_options, devices::make($dev), $part->{device_LABEL}); } elsif (defined $first_options[0]) { @args = ($cmd, @first_options, $part->{device_LABEL}, devices::make($dev)); } else { diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index cf31cbb21..11d9cf908 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,5 @@ - diskdrake: - o enable to set label on nilfs fses + o enable to set label on btrfs & nilfs fses Version 13.76 - 20 January 2012 |