diff options
Diffstat (limited to 'perl-install/diskdrake')
| -rw-r--r-- | perl-install/diskdrake/hd_gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index d674d1e35..a4ce1be77 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -326,7 +326,7 @@ sub current_part() { sub kind2hd { my ($kind) = @_; - $kind->{type} =~ /hd|lvm/ ? $kind->{val} : {} + $kind->{type} =~ /hd|lvm/ ? $kind->{val} : {}; } sub hd2kind { diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index cbf1370ec..3cc33dd90 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -320,7 +320,7 @@ sub Clear_all { RemoveFromRAID($in, $hd, $_, $all_hds) if isPartOfRAID($_); } if (isLVM($hd)) { - lvm::lv_delete($hd, $_) foreach @parts + lvm::lv_delete($hd, $_) foreach @parts; } else { $hd->{readonly} = 0; #- give a way out of readonly-ness. only allowed when getting_rid_of_readonly_allowed $hd->{getting_rid_of_readonly_allowed} = 0; @@ -923,7 +923,7 @@ sub Options { [ (map { { label => $_, text => scalar warp_text(formatAlaTeX($help{$_})), val => \$options->{$_}, hidden => scalar(/password/), - advanced => !$part->{rootDevice} && !member($_, @simple_options), if_(!/=$/, type => 'bool'), } + advanced => !$part->{rootDevice} && !member($_, @simple_options), if_(!/=$/, type => 'bool') }; } keys %$options), { label => N("Various"), val => \$unknown, advanced => 1 }, ], @@ -1263,7 +1263,7 @@ sub choose_encrypt_key { complete => sub { length $encrypt_key < 6 and $in->ask_warn('', N("This encryption key is too simple (must be at least %d characters long)", 6)), return 1,0; $encrypt_key eq $encrypt_key2 or $in->ask_warn('', [ N("The encryption keys do not match"), N("Please try again") ]), return 1,1; - return 0 + return 0; } } }, [ { label => N("Encryption key"), val => \$encrypt_key, hidden => 1 }, { label => N("Encryption key (again)"), val => \$encrypt_key2, hidden => 1 }, |