Sophie

Sophie

distrib > Mandriva > 2011.0 > i586 > media > main-updates-src > by-pkgid > 9cd8634de8e36116a404116cd5910eb2 > files > 2

drakxtools-13.51-10.2.src.rpm

--- drakxtools-13.51.old/perl-install/any.pm	2011-06-27 19:02:32.000000000 +0400
+++ drakxtools-13.51/perl-install/any.pm	2011-08-19 15:07:12.982409279 +0400
@@ -400,6 +400,7 @@
     my $prev_method = $b->{method};
 
     $b->{password2} ||= $b->{password} ||= '';
+    $b->{timeout} = 5;
     $::Wizard_title = N("Boot Style Configuration");
     if (arch() !~ /ppc/) {
 	my (@boot_devices, %boot_devices);
@@ -428,17 +429,6 @@
             { text => N("Enable APIC"), val => \$enable_apic, type => 'bool', advanced => 1,
               disabled => sub { !$enable_lapic } }, 
             { text => N("Enable Local APIC"), val => \$enable_lapic, type => 'bool', advanced => 1 },
-            { label => N("Security"), title => 1 },
-	    { label => N("Password"), val => \$b->{password}, hidden => 1,
-	      validate => sub { 
-		  my $ok = $b->{password} eq $b->{password2}
-                    or $in->ask_warn('', [ N("The passwords do not match"), N("Please try again") ]);
-		  my $ok2 = !($b->{password} && $b->{method} eq 'grub-graphic')
-                    or $in->ask_warn('', N("You can not use a password with %s",
-                                           bootloader::method2text($b->{method})));
-		  $ok && $ok2;
-	      } },
-            { label => N("Password (again)"), val => \$b->{password2}, hidden => 1 },
             { text => N("Clean /tmp at each boot"), val => \$clean_tmp, type => 'bool', advanced => 1 },
         ]) or return 0;
     } else {