diff options
Diffstat (limited to 'perl-install/fs/format.pm')
| -rw-r--r-- | perl-install/fs/format.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm index 6a7a0856b..509134b17 100644 --- a/perl-install/fs/format.pm +++ b/perl-install/fs/format.pm @@ -109,7 +109,7 @@ sub write_label { my ($part) = @_; $part->{device_LABEL_changed} or return; - $part->{isNotFormatted} and return; + maybeFormatted($part) or return; if ($part->{encrypt_key}) { fs::mount::set_loop($part); @@ -123,7 +123,7 @@ sub write_label { } else { @args = ($cmd, devices::make($dev), $part->{device_LABEL}); } - run_program::raw({ timeout => 'never' }, @args) or die N("setting label on %s failed", $dev); + run_program::raw({ timeout => 'never' }, @args) or die N("setting label on %s failed, is it formatted?", $dev); delete $part->{device_LABEL_changed}; } @@ -174,6 +174,8 @@ sub part_raw { run_program::raw({ timeout => 'never' }, @args) or die N("%s formatting of %s failed", $fs_type, $dev); } + delete $part->{device_LABEL_changed}; + # Preserve UUID on fs where we couldn't enforce it while formatting if ($fs_type eq 'jfs') { run_program::raw('jfs_tune', '-U', devices::make($dev)); |