summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/ChangeLog5
-rw-r--r--perl-install/install_steps.pm2
-rw-r--r--perl-install/printerdrake.pm2
-rwxr-xr-xperl-install/standalone/printerdrake4
4 files changed, 9 insertions, 4 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index c94a8ce37..4bcf36553 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -6,6 +6,11 @@
* install2.pm: add exit button if live upgrade.
+ * install_steps.pm, standalone/printerdrake: fixed cups to CUPS
+ for mode.
+
+ * share/Cards+: fixed Savage2000 entry.
+
2000-10-03 DrakX <install@linux-mandrake.com>
* snapshot uploaded
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index ece51df5c..3f1d575fd 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -548,7 +548,7 @@ sub configurePrinter {
my ($use_cups, $use_lpr) = (0, 0);
foreach (values %{$o->{printer}{configured} || {}}) {
for ($_->{mode}) {
- /cups/ and $use_cups++;
+ /CUPS/ and $use_cups++;
/lpr/ and $use_lpr++;
}
}
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index ed70ba60b..0546667d4 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -422,7 +422,7 @@ name (often lp) and a spool directory associated with it. What
name and directory should be used for this queue and how is the printer connected?"), [
_("Name of queue") => { val => \$printer->{QUEUE} },
_("Spool directory") => { val => \$printer->{SPOOLDIR} },
-_("Printer Connection") => { val => \$printer->{str_type}, list => [ printer::printer_type($printer) ] },
+_("Printer Connection") => { val => \$printer->{str_type}, list => [ printer::printer_type($printer) ], not_edit => 1 },
],
changed => sub {
$printer->{SPOOLDIR} = printer::default_spooldir($printer) unless $_[0];
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index dd41620fb..cee224da9 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -39,8 +39,8 @@ $::isStandalone = 1;
my $printer; eval { $printer = printer::getinfo('') };
/-lpr/ and $printer->{mode} = 'lpr';
-/-cups/ and $printer->{mode} = 'cups';
-$printer->{mode} ||= 'cups'; #- assume this default if nothing found.
+/-cups/ and $printer->{mode} = 'CUPS';
+$printer->{mode} ||= 'CUPS'; #- assume this default if nothing found.
my $in = vnew interactive('su');