69 files changed, 134 insertions, 134 deletions
diff --git a/perl-install/install_messages.pm b/perl-install/install_messages.pm index 764007fa1..cb7fe15ed 100644 --- a/perl-install/install_messages.pm +++ b/perl-install/install_messages.pm @@ -141,7 +141,7 @@ consult the Errata available from: Information on configuring your system is available in the post install chapter of the Official Mandrakelinux User's Guide.", -N("http://www.mandrakelinux.com/en/101errata.php3")); +N("http://www.mandrakelinux.com/en/102errata.php3")); } 1; diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot index 5a552c286..b821c796a 100644 --- a/perl-install/share/po/DrakX.pot +++ b/perl-install/share/po/DrakX.pot @@ -4888,7 +4888,7 @@ msgstr "" #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX #: install_messages.pm:144 #, c-format -msgid "http://www.mandrakelinux.com/en/101errata.php3" +msgid "http://www.mandrakelinux.com/en/102errata.php3" msgstr "" #: install_steps.pm:246 diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po functions
#-###############################################################################
sub write_preload_conf {
my ($conf) = @_;
my @l;
my $is_laptop = detect_devices::isLaptop();
my $manufacturer = detect_devices::dmidecode_category('System')->{Manufacturer};
push @l, 'scsi_hostadapter' if $conf->get_probeall('scsi_hostadapter');
push @l, detect_devices::probe_name('Module');
push @l, 'nvram' if $is_laptop;
push @l, map { $_->{driver} } detect_devices::probe_category($_) foreach qw(multimedia/dvb multimedia/tv various/agpgart various/laptop input/joystick various/crypto disk/card_reader);
push @l, 'padlock-aes', 'padlock-sha' if cat_("/proc/cpuinfo") =~ /rng_en/;
push @l, 'evdev' if detect_devices::hasTouchpad();
push @l, 'evdev' if any { $_->{HWHEEL} } detect_devices::getInputDevices();
push @l, 'hdaps' if $is_laptop && $manufacturer eq 'LENOVO';
append_to_modules_loaded_at_startup("$::prefix/etc/modprobe.preload", @l);
}
sub append_to_modules_loaded_at_startup_for_all_kernels {
append_to_modules_loaded_at_startup($_, @_) foreach "$::prefix/etc/modprobe.preload";
}
sub append_to_modules_loaded_at_startup {
my ($file, @l) = @_;
my $l = join '|', map { '^\s*' . $_ . '\s*$' } @l;
log::l("to put in $file ", join(", ", @l));
substInFile {
$_ = '' if $l && /$l/;
$_ .= join '', map { "$_\n" } @l if eof;
} $file;
}
sub set_preload_modules {
my ($service, @modules) = @_;
my $preload_file = "$::prefix/etc/modprobe.preload.d/$service";
if (@modules) {
output_p($preload_file, join("\n", @modules, ''));
} else {
unlink($preload_file);
}
eval { load(@modules) } if @modules && !$::isInstall;
}
#-###############################################################################
#- internal functions
#-###############################################################################
sub loaded_modules() {
map { /(\S+)/ } cat_("/proc/modules");
}
sub filter_out_loaded_modules {
my (@l) = @_;
difference2([ uniq(@l) ], [ map { my $s = $_; $s =~ s/_/-/g; $s, $_ } loaded_modules() ]);
}
sub read_already_loaded {
my ($conf) = @_;
when_load($conf, $_) foreach reverse loaded_modules();
}
sub when_load {
my ($conf, $name) = @_;
if (my $category = module2category($name)) {
when_load_category($conf, $name, $category);
}
if (my @above = $conf->get_above($name)) {
load(@above); #- eg: for snd-pcm-oss set by set_sound_slot()
}
}
sub when_load_category {
my ($conf, $name, $category) = @_;
if ($category =~ m,disk/ide,) {
$conf->add_probeall('ide-controller', $name);
eval { load('ide_gd_mod') };
} elsif ($category =~ m,disk/(scsi|hardware_raid|sata|firewire|virtual),) {
$conf->add_probeall('scsi_hostadapter', $name);
eval { load('sd_mod') };
} elsif ($category eq 'bus/usb') {
$conf->add_probeall('usb-interface', $name);
-f '/sys/kernel/debug/usb/devices' or eval {
require fs::mount; fs::mount::sys_kernel_debug('');
#- ensure keyboard is working, the kernel must do the job the BIOS was doing
sleep 4;
load("usbhid") if detect_devices::usbKeyboards();
};
} elsif ($category eq 'bus/firewire') {
$conf->set_alias('ieee1394-controller', $name);
} elsif ($category =~ /sound/) {
my $sound_alias = find { /^sound-slot-[0-9]+$/ && $conf->get_alias($_) eq $name } $conf->modules;
$sound_alias ||= 'sound-slot-0';
$conf->set_sound_slot($sound_alias, $name);
} elsif ($category =~ m!disk/card_reader!) {
my @modules = ('mmc_block', if_($name =~ /tifm_7xx1/, 'tifm_sd'));
$conf->set_above($name, join(' ', @modules));
}
}
1;
index 8920299cc..b7e2eb5e2 100644 --- a/perl-install/share/po/af.po +++ b/perl-install/share/po/af.po |