summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-12 19:03:25 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-12 19:03:25 +0000
commit3e7ac9af750f6c4968d38ea5e6717a4940db7dc2 (patch)
treeb23df042f801f80a660b1f84d7e1231776532719
parente66c5a4cec2267d8a19ca6c924e58caa17175bbf (diff)
downloaddrakx-3e7ac9af750f6c4968d38ea5e6717a4940db7dc2.tar
drakx-3e7ac9af750f6c4968d38ea5e6717a4940db7dc2.tar.gz
drakx-3e7ac9af750f6c4968d38ea5e6717a4940db7dc2.tar.bz2
drakx-3e7ac9af750f6c4968d38ea5e6717a4940db7dc2.tar.xz
drakx-3e7ac9af750f6c4968d38ea5e6717a4940db7dc2.zip
no_comment
-rw-r--r--docs/TODO7
-rw-r--r--perl-install/detect_devices.pm5
-rw-r--r--perl-install/install2.pm1
-rw-r--r--perl-install/install_any.pm4
-rw-r--r--perl-install/pkgs.pm1
5 files changed, 10 insertions, 8 deletions
diff --git a/docs/TODO b/docs/TODO
index 2c18716e9..dd72e6770 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,13 +1,9 @@
ddcprobe for pnp monitors
-smp::detect
-
kickstart like
upgrade
-have a better time estimation of the remaining time in install packages
-
update the list of modules (in update_kernel)
look at the pcmcia case
@@ -27,6 +23,8 @@ verify the free space is big enough.
loadFont sucks
+have a better time estimation of the remaining time in install packages
+
trash on the screen when X first starts
get the error when reading .rpm files fail
@@ -78,3 +76,4 @@ strange: no scsi of type 'fd', only 'tape'
try detect_devices::floppies (and how are scsi floppies handled?)
maybe: do a iotcl FDGETPRM to detect fd1, fd0.
+test smp (is it enough to scan /proc/cpuinfo for multiple /^processor/ lines?)
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index fd98b409a..034fa48b9 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -166,3 +166,8 @@ sub syslog {
-r "/tmp/syslog" and return map { /<\d+>(.*)/ } cat_("/tmp/syslog");
`dmesg`
}
+
+sub hasSMP {
+ my $nb = grep { /^processor/ } cat_("/proc/cpuinfo");
+ $nb > 1;
+}
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 25d43b250..45340f8e9 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -21,7 +21,6 @@ use pkgs;
use printer;
use modules;
use detect_devices;
-use smp;
use modparm;
use run_program;
use install_steps_graphical;
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 2386619b8..4c96920a0 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -12,8 +12,8 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK);
use common qw(:common :system);
use run_program;
+use detect_devices;
use pkgs;
-use smp;
use log;
1;
@@ -108,7 +108,7 @@ sub setPackages($$) {
$o->{compss} = pkgs::readCompss ($o->{packages});
$o->{compssListLevels} = pkgs::readCompssList($o->{packages});
$o->{compssListLevels} ||= $install_classes;
- push @{$o->{base}}, "kernel-smp" if smp::detect();
+ push @{$o->{base}}, "kernel-smp" if detect_devices::hasSMP();
do {
my $p = $o->{packages}{$_} or log::l(), next;
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 18f1693be..6a6bf002d 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -7,7 +7,6 @@ use vars qw($fd);
use common qw(:common :file :functional);
use install_any;
use log;
-use smp;
use pkgs;
use fs;
use lang;