summaryrefslogtreecommitdiffstats
path: root/perl-install/fs
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-12-08 22:31:57 +0000
committerThierry Vignaud <tv@mandriva.org>2009-12-08 22:31:57 +0000
commit939ff5ef1b5b48b7e3948b94ff56d9db48ddde76 (patch)
treecf58de655fac8ac535ef5e92dfc337adf039f4ac /perl-install/fs
parentccdb8914ad4d756e0ff900edc6268560f6a67d05 (diff)
downloaddrakx-939ff5ef1b5b48b7e3948b94ff56d9db48ddde76.tar
drakx-939ff5ef1b5b48b7e3948b94ff56d9db48ddde76.tar.gz
drakx-939ff5ef1b5b48b7e3948b94ff56d9db48ddde76.tar.bz2
drakx-939ff5ef1b5b48b7e3948b94ff56d9db48ddde76.tar.xz
drakx-939ff5ef1b5b48b7e3948b94ff56d9db48ddde76.zip
(write_label) get rid of another FIXME: fix setting volume label
instead of boot sector label for FAT fses (#52853)
Diffstat (limited to 'perl-install/fs')
-rw-r--r--perl-install/fs/format.pm9
1 files changed, 5 insertions, 4 deletions
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});