summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-01-23 19:05:40 +0000
committerThierry Vignaud <tv@mageia.org>2012-01-23 19:05:40 +0000
commitcbf7a0bf013fd2cd7cd72e7db812e0d9c7c00f72 (patch)
tree8c03a5397421efa39c7b56a13b42f3da566d7f55 /perl-install
parent2f0b2a61aeb0f7e8d6eeacc9ef2935b863266578 (diff)
downloaddrakx-cbf7a0bf013fd2cd7cd72e7db812e0d9c7c00f72.tar
drakx-cbf7a0bf013fd2cd7cd72e7db812e0d9c7c00f72.tar.gz
drakx-cbf7a0bf013fd2cd7cd72e7db812e0d9c7c00f72.tar.bz2
drakx-cbf7a0bf013fd2cd7cd72e7db812e0d9c7c00f72.tar.xz
drakx-cbf7a0bf013fd2cd7cd72e7db812e0d9c7c00f72.zip
(write_label) enable to set label on btrfs fses
needs reverse <device>,<label> ordering
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/fs/format.pm5
-rw-r--r--perl-install/install/NEWS2
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