summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorpad <pad@mandriva.com>1999-09-05 21:28:36 +0000
committerpad <pad@mandriva.com>1999-09-05 21:28:36 +0000
commit38dce4a6d02d689b7aefa2b5f925ac5441c51a89 (patch)
tree78e8513e786585460ab499c1614e46dfbf1e25be /perl-install/install2.pm
parentfeaf2a529e993fee5bd71560d883ef354537ed6a (diff)
downloaddrakx-38dce4a6d02d689b7aefa2b5f925ac5441c51a89.tar
drakx-38dce4a6d02d689b7aefa2b5f925ac5441c51a89.tar.gz
drakx-38dce4a6d02d689b7aefa2b5f925ac5441c51a89.tar.bz2
drakx-38dce4a6d02d689b7aefa2b5f925ac5441c51a89.tar.xz
drakx-38dce4a6d02d689b7aefa2b5f925ac5441c51a89.zip
code clarification + bugfix
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 3fb964b51..ce514710e 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -287,10 +287,11 @@ $o = $::o = {
GMT => 1,
},
printer => {
+ want => 1,
complete => 0,
str_type => $printer::printer_type[0],
QUEUE => "lp",
- SPOOLDIR => "/var/spool/lpd/lp/",
+ SPOOLDIR => "/var/spool/lpd/lp",
DBENTRY => "DeskJet670",
PAPERSIZE => "legal",
CRLF => 0,
@@ -473,7 +474,7 @@ sub configureNetwork {
sub configureTimezone {
my ($clicked) = $_[0];
my $f = "$o->{prefix}/etc/sysconfig/clock";
- return if ((-s $f) || 0) > 0 && $_[1] == 1 && !$clicked;
+ return if ((-s $f) || 0) > 0 && $_[1] == 1 && !$clicked && !$::testing;
$o->timeConfig($f);
}