[2763] (write_label) enable to set label on btrfs fses

[root-odJJhXpcy38dnm+]

Revision: 2763
Author: tv
Date: 2012-01-23 20:05:40 +0100 (Mon, 23 Jan 2012)
Log Message:
-----------
(write_label) enable to set label on btrfs fses

needs reverse <device>,<label> ordering

Modified Paths:
--------------
drakx/trunk/perl-install/NEWS
drakx/trunk/perl-install/fs/format.pm
drakx/trunk/perl-install/install/NEWS

Modified: drakx/trunk/perl-install/NEWS
===================================================================
--- drakx/trunk/perl-install/NEWS 2012-01-23 19:05:37 UTC (rev 2762)
+++ drakx/trunk/perl-install/NEWS 2012-01-23 19:05:40 UTC (rev 2763)
@@ -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


Modified: drakx/trunk/perl-install/fs/format.pm
===================================================================
--- drakx/trunk/perl-install/fs/format.pm 2012-01-23 19:05:37 UTC (rev 2762)
+++ drakx/trunk/perl-install/fs/format.pm 2012-01-23 19:05:40 UTC (rev 2763)
@@ -62,7 +62,7 @@
# 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 @@
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 {

Modified: drakx/trunk/perl-install/install/NEWS
===================================================================
--- drakx/trunk/perl-install/install/NEWS 2012-01-23 19:05:37 UTC (rev 2762)
+++ drakx/trunk/perl-install/install/NEWS 2012-01-23 19:05:40 UTC (rev 2763)
@@ -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