summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-09-21 15:37:57 +0000
committerFrancois Pons <fpons@mandriva.com>2000-09-21 15:37:57 +0000
commit32ed21150619d9d6f413d5be9b59e74001f81732 (patch)
tree3d37671415564b506143cb2d54105919707b81ac
parent28d4952a757d83f8d90b3d0062f4aa169a399694 (diff)
downloaddrakx-32ed21150619d9d6f413d5be9b59e74001f81732.tar
drakx-32ed21150619d9d6f413d5be9b59e74001f81732.tar.gz
drakx-32ed21150619d9d6f413d5be9b59e74001f81732.tar.bz2
drakx-32ed21150619d9d6f413d5be9b59e74001f81732.tar.xz
drakx-32ed21150619d9d6f413d5be9b59e74001f81732.zip
*** empty log message ***
-rw-r--r--perl-install/ChangeLog8
-rw-r--r--perl-install/install_steps.pm6
-rw-r--r--perl-install/printer.pm2
-rw-r--r--perl-install/printerdrake.pm1
4 files changed, 13 insertions, 4 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index afe3724a7..79fea39cf 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,11 @@
+2000-09-21 François Pons <fpons@mandrakesoft.com>
+
+ * install_steps.pm, netconnect.pm: changed NETWORKING reference
+ from false to no.
+ * printer.pm: changed timeout from 30 to 60.
+ * printerdrake.pm: added wait message when waiting for cups to
+ start.
+
2000-09-21 DrakX <install@linux-mandrake.com>
* snapshot uploaded
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index ca5cd2a2a..eca7b612d 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -843,7 +843,7 @@ sub exitInstall { install_any::unlockCdrom }
sub hasNetwork {
my ($o) = @_;
- $o->{intf} && $o->{netc}{NETWORKING} ne 'false' || $o->{netcnx}{modem};
+ $o->{intf} && $o->{netc}{NETWORKING} ne 'no' || $o->{netcnx}{modem};
}
#------------------------------------------------------------------------------
@@ -855,7 +855,7 @@ sub upNetwork {
}
modules::write_conf($o->{prefix});
- if ($o->{intf} && $o->{netc}{NETWORKING} ne 'false') {
+ if ($o->{intf} && $o->{netc}{NETWORKING} ne 'no') {
network::up_it($o->{prefix}, $o->{intf});
} elsif (!$pppAvoided && $o->{netcnx}{modem} && !$o->{netcnx}{modem}{isUp}) {
eval { modules::load_multi(qw(serial ppp bsd_comp ppp_deflate)) };
@@ -873,7 +873,7 @@ sub downNetwork {
my ($o, $pppOnly) = @_;
modules::write_conf($o->{prefix});
- if (!$pppOnly && $o->{intf} && $o->{netc}{NETWORKING} ne 'false') {
+ if (!$pppOnly && $o->{intf} && $o->{netc}{NETWORKING} ne 'no') {
network::down_it($o->{prefix}, $o->{intf});
} elsif ($o->{netcnx}{modem} && $o->{netcnx}{modem}{isUp}) {
run_program::rooted($o->{prefix}, "ifdown", "ppp0");
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index 985b395d7..0abaf1a64 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -369,7 +369,7 @@ sub poll_ppd_base {
run_program::rooted($prefix, "ifup lo"); #- else cups will not be happy!
run_program::rooted($prefix, "/etc/rc.d/init.d/cups start");
- foreach (1..30) {
+ foreach (1..60) {
local *PPDS; open PPDS, ($::testing ? "$prefix" : "chroot $prefix/ ") . "/usr/bin/poll_ppd_base -a |";
foreach (<PPDS>) {
chomp;
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index 50cd6171c..08c79ee94 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -361,6 +361,7 @@ You can add some more or change the existing ones."),
#- switch according to what is being installed: cups, lpr or other.
for ($printer->{mode}) {
/CUPS/ && do { &$install('cups-drivers') unless $::testing;
+ my $w = $in->wait_message(_("CUPS starting"), _("Reading CUPS drivers database..."));
printer::poll_ppd_base(); last };
/lpr/ && do { &$install('rhs-printfilters') unless $::testing;
printer::read_printer_db(); last };