diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-05-03 19:48:56 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-05-03 19:48:56 +0000 |
| commit | 958e1780193e5864418b4e60e3a5fb9693393d38 (patch) | |
| tree | 79110b5529f09d681790926079c848bdfbb56a47 | |
| parent | b72aed14c63402b16f692a327d68d8112d88cc99 (diff) | |
| download | drakx-958e1780193e5864418b4e60e3a5fb9693393d38.tar drakx-958e1780193e5864418b4e60e3a5fb9693393d38.tar.gz drakx-958e1780193e5864418b4e60e3a5fb9693393d38.tar.bz2 drakx-958e1780193e5864418b4e60e3a5fb9693393d38.tar.xz drakx-958e1780193e5864418b4e60e3a5fb9693393d38.zip | |
no_comment
| -rw-r--r-- | perl-install/detect_devices.pm | 3 | ||||
| -rw-r--r-- | perl-install/help.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 9a6061484..ebb40a7e9 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -202,6 +202,9 @@ sub hasSMP { c::detectSMP() } sub hasUltra66 { cat_("/proc/cmdline") =~ /(ide2=(\S+)(\s+ide3=(\S+))?)/ and return $1; + #- disable hasUltra66 (now included in kernel) + return; + require pci_probing::main; my @l = map { $_->[0] } pci_probing::main::matching_desc('(HPT|Ultra66)') or return; diff --git a/perl-install/help.pm b/perl-install/help.pm index da4c49b41..6a17e6c1d 100644 --- a/perl-install/help.pm +++ b/perl-install/help.pm @@ -20,7 +20,7 @@ or 7.0 (Air). Select: - - Recommended: If you have never installed Linux before, choose this. NOTE: + - Automated (recommended): If you have never installed Linux before, choose this. NOTE: networking will not be configured during installation, use \"LinuxConf\" to configure it after the install completes. diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index dadbcec8b..0ddecb4ea 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -106,7 +106,7 @@ sub selectInstallClass($@) { my ($o, @classes) = @_; my %c = my @c = ( $::corporate ? () : ( - _("Recommended") => "beginner", + _("Automated") => "beginner", ), _("Customized") => "specific", _("Expert") => "expert", |