summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-08-26 11:59:16 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-08-26 11:59:16 +0000
commit0ed1f0052f4762ca9006ca49d9f93ffdd55bffb3 (patch)
tree87626f109e2efa7d7cd0a6e2221e847600e98a1c
parentbdb8da1d8761802650c00f96b89b26bc6bf01181 (diff)
downloaddrakx-0ed1f0052f4762ca9006ca49d9f93ffdd55bffb3.tar
drakx-0ed1f0052f4762ca9006ca49d9f93ffdd55bffb3.tar.gz
drakx-0ed1f0052f4762ca9006ca49d9f93ffdd55bffb3.tar.bz2
drakx-0ed1f0052f4762ca9006ca49d9f93ffdd55bffb3.tar.xz
drakx-0ed1f0052f4762ca9006ca49d9f93ffdd55bffb3.zip
while bootstrapping, only write /etc/modules.conf only if we really altered it
(thus preventing depmod to be runned everytime)
-rw-r--r--perl-install/harddrake/sound.pm3
-rwxr-xr-xperl-install/standalone/service_harddrake1
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index f11b9a23b..dbade4e7c 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -290,9 +290,12 @@ The current driver for your \"%s\" sound card is \"%s\" ", $device->{description
sub configure_sound_slots() {
+ my $altered = 0;
each_index {
+ $altered ||= modules::get_alias("sound-slot-$::i") ne $_->{driver};
modules::add_alias("sound-slot-$::i", $_->{driver});
} detect_devices::getSoundDevices();
+ modules::write_conf() if $altered && $::isStandalone;
}
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 9b960de5c..3dccca3ff 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -95,6 +95,5 @@ Storable::store(\%config, $last_boot_config);
# automatic sound slots configuration
harddrake::sound::configure_sound_slots();
-modules::write_conf();
$in->exit(0) if $in;