summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-01-03 14:54:19 +0000
committerFrancois Pons <fpons@mandriva.com>2000-01-03 14:54:19 +0000
commitcd67a9f06a34f25d7e58dc72f957edccb4f0ba02 (patch)
treeb3e93f6b0a7ff9bf58ad320e10d39fcc533c9cc2 /perl-install
parent944298c505941597f0ba08e0fb8752ebee40e58e (diff)
downloaddrakx-cd67a9f06a34f25d7e58dc72f957edccb4f0ba02.tar
drakx-cd67a9f06a34f25d7e58dc72f957edccb4f0ba02.tar.gz
drakx-cd67a9f06a34f25d7e58dc72f957edccb4f0ba02.tar.bz2
drakx-cd67a9f06a34f25d7e58dc72f957edccb4f0ba02.tar.xz
drakx-cd67a9f06a34f25d7e58dc72f957edccb4f0ba02.zip
*** empty log message ***
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/install_steps_interactive.pm13
-rw-r--r--perl-install/printerdrake.pm2
3 files changed, 11 insertions, 6 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 333ec7abf..911a2f5cd 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -341,7 +341,7 @@ sub choosePackages {
require pkgs;
$o->setPackages if $_[1] == 1;
$o->selectPackagesToUpgrade($o) if $o->{isUpgrade} && $_[1] == 1;
- if ($_[1] > 1 || !$o->{isUpgrade}) {
+ if ($_[1] > 1 || !$o->{isUpgrade} || $::expert) {
$o->choosePackages($o->{packages}, $o->{compss},
$o->{compssUsers}, $o->{compssUsersSorted}, $_[1] == 1);
pkgs::unselect($o->{packages}, $o->{packages}{kdesu}) if $o->{packages}{kdesu} && $o->{security} > 3;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index c9009ec78..a66f0d07f 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -600,6 +600,11 @@ sub addUser($) {
sub createBootdisk {
my ($o, $first_time) = @_;
my @l = detect_devices::floppies();
+ my %l = (
+ 'fd0' => __("First drive"),
+ 'fd1' => __("Second drive"),
+ 'Skip' => __("Skip"),
+ );
if ($first_time || @l == 1) {
$o->ask_yesorno('',
@@ -614,9 +619,9 @@ failures. Would you like to create a bootdisk for your system?"),
} else {
@l or die _("Sorry, no floppy drive available");
- $o->{mkbootdisk} = $o->ask_from_list_('',
- _("Choose the floppy drive you want to use to make the bootdisk"),
- [ @l, __("Skip") ], $o->{mkbootdisk});
+ $o->{mkbootdisk} = ${{reverse %l}}{$o->ask_from_list_('',
+ _("Choose the floppy drive you want to use to make the bootdisk"),
+ [ @l{@l, "Skip"} ], $o->{mkbootdisk})};
return $o->{mkbootdisk} = '' if $o->{mkbootdisk} eq 'Skip';
}
@@ -743,7 +748,7 @@ _("Default") => { val => \$default, type => 'bool' },
$name ne $old_name && $b->{entries}{$name} and $o->ask_warn('', _("A entry %s already exists", $name)), return 1;
}
)) {
- $b->{default} = $old_default ^ $default ? $default && $e->{label} : $b->{default};
+ $b->{default} = $old_default || $default ? $default && $e->{label} : $b->{default};
delete $b->{entries}{$old_name};
$b->{entries}{$name} = $e;
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index 876f39dbe..a5e1b4a8b 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -82,7 +82,7 @@ name and directory should be used for this queue?"),
{
$printer->{SPOOLDIR} = "$printer::spooldir/$printer->{QUEUE}" unless $_[0];
},
- );
+ ) or return; #- cancel
}
copy_printer_params($printer->{configured}{$printer->{QUEUE}}, $printer); #- get default parameters from existing queue.