diff options
Diffstat (limited to 'perl-install/diskdrake')
-rw-r--r-- | perl-install/diskdrake/interactive.pm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 6167a29dc..e0b24a7f0 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -445,10 +445,10 @@ sub part_possible_actions { } sub View { - my ($in, $hd, $part, $all_hds) = @_; + my ($in, $_hd, $part, $_all_hds) = @_; my $handle = any::inspect($part, $::prefix); if ($handle) { - $in->ask_directory({'directory'=>$handle->{dir}}); + $in->ask_directory({ 'directory' => $handle->{dir} }); } else { $in->ask_warn(N("Error"), N("Failed to mount partition")); } @@ -518,8 +518,8 @@ sub Create { # if user asked to encrypt the partition, use dm-crypt and create requested fs inside if ($use_dmcrypt) { my $err; - $err = N("The encryption keys do not match") unless ($part->{dmcrypt_key} eq $part->{dmcrypt_key2}); - $err = N("Missing encryption key") unless ($part->{dmcrypt_key}); + $err = N("The encryption keys do not match") unless $part->{dmcrypt_key} eq $part->{dmcrypt_key2}; + $err = N("Missing encryption key") unless $part->{dmcrypt_key}; if ($err) { $in->ask_warn(N("Error"), $err); return 1; @@ -675,10 +675,10 @@ sub Type { } sub Label { - my ($in, $_hd, $part) = @_; + my ($in, $hd, $part) = @_; my $new_label = $part->{device_LABEL} || ""; - write_partitions($in, $_hd) or return; + write_partitions($in, $hd) or return; $in->ask_from(N("Set volume label"), maybeFormatted($part) ? @@ -853,7 +853,7 @@ sub Resize { lvm::lv_resize($low_part, $oldsize); } else { if ($write_partitions && isLUKS($part)) { - run_program::run('cryptsetup', 'luksClose', $part->{dmcrypt_name}) or die ("Failed to resize partition, maybe it is mounted"); + run_program::run('cryptsetup', 'luksClose', $part->{dmcrypt_name}) or die("Failed to resize partition, maybe it is mounted"); } partition_table::will_tell_kernel($hd, resize => $low_part); partition_table::adjust_local_extended($hd, $low_part); @@ -1000,7 +1000,7 @@ sub Add2LVM { $in->ask_warn(N("Error"), N("\"%s\" already exists", $name)); return 0; } }, - [{label=>N("LVM name"),val=> \$name}]) or return; + [ { label => N("LVM name"), val => \$name } ]) or return; $lvm = new lvm($name); push @$lvms, $lvm; @@ -1085,7 +1085,7 @@ sub Loopback { } sub Options { - my ($in, $hd, $part, $all_hds) = @_; + my ($in, $_hd, $part, $_all_hds) = @_; my @simple_options = qw(users noauto username= password=); @@ -1136,7 +1136,7 @@ sub Options { *{'Modify RAID'} = \&ModifyRAID; *{'Add to RAID'} = \&Add2RAID; *{'Remove from RAID'} = \&RemoveFromRAID; - *{'Use'} = \&dmcrypt_open; + *{Use} = \&dmcrypt_open; *{'Remove from dm'} = \&RemoveFromDm; *{'Add to LVM'} = \&Add2LVM; *{'Remove from LVM'} = \&RemoveFromLVM; @@ -1259,7 +1259,7 @@ sub ensure_we_have_encrypt_key_if_needed { } sub dmcrypt_format { - my ($in, $hd, $part, $all_hds) = @_; + my ($in, $_hd, $part, $_all_hds) = @_; my $_wait = $in->wait_message(N("Please wait"), N("Formatting partition %s", $part->{device})); require fs::dmcrypt; fs::dmcrypt::format_part($part); @@ -1390,7 +1390,7 @@ sub format_part_info { $info .= N("Mounted\n") if $part->{isMounted}; $info .= N("RAID %s\n", $part->{raid}) if isPartOfRAID($part); if (fs::type::isRawLUKS($part) || fs::type::isLUKS($part)) { - $info .= N("Encrypted")."\n"; + $info .= N("Encrypted") . "\n"; if (fs::type::isRawLUKS($part)) { $info .= ($part->{dm_active} && $part->{dm_name} ? N(" (mapped on %s)", $part->{dm_name}) : $part->{dm_name} ? N(" (to map on %s)", $part->{dm_name}) : |