summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/fs/format.pm9
-rw-r--r--perl-install/install/NEWS3
3 files changed, 10 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 08e180dba..2509833c0 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake
+ o fix setting volume label instead of MBR's one for FAT fses (#52853)
- localedrake
o fix configuring ibus (#56130)
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index 95e9bd83a..25b08939b 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -55,9 +55,8 @@ my %edit_LABEL = ( # package, command, option
xfs => [ 'xfsprogs', 'xfs_admin', '-L' ],
jfs => [ 'jfsutils', 'jfs_tune', '-L' ],
# hfs
- #FIXME we should use mlabel -i <device> ::<label> (#52853)
- dos => [ 'dosfstools', 'dosfslabel' ],
- vfat => [ 'dosfstools', 'dosfslabel' ],
+ dos => [ 'mtools', 'mlabel', '-i' ],
+ vfat => [ 'mtools', 'mlabel', '-i' ],
# swap => [ 'util-linux-ng', 'mkswap' ],
ntfs => [ 'ntfsprogs', 'ntfslabel' ],
'ntfs-3g' => [ 'ntfsprogs', 'ntfslabel' ],
@@ -122,7 +121,9 @@ sub write_label {
my $dev = $part->{real_device} || $part->{device};
my ($_pkg, $cmd, @first_options) = @{$edit_LABEL{$part->{fs_type}} || die N("I do not know how to set label on %s with type %s", $part->{device}, $part->{fs_type})};
my @args;
- if (defined $first_options[0]) {
+ if ($cmd eq 'mlabel') {
+ @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 {
@args = ($cmd, devices::make($dev), $part->{device_LABEL});
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 250481900..a52007e0e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- partitioning wizard:
+ o fix setting volume label instead of MBR's one for FAT fses (#52853)
+
Version 13.0 - 1 December 2009
- do not offer to upgrade/install in restore mode