summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/service_harddrake
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-01-23 15:48:35 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-01-23 15:48:35 +0000
commit4a89b3c8a1cde1080889fb6ac309e262e524ebd1 (patch)
treeba540edb4d64f9db0a8356a85798a6281dc98dd1 /perl-install/standalone/service_harddrake
parent1620119c705484fa12f142cb844f0b21e421f7cf (diff)
downloaddrakx-4a89b3c8a1cde1080889fb6ac309e262e524ebd1.tar
drakx-4a89b3c8a1cde1080889fb6ac309e262e524ebd1.tar.gz
drakx-4a89b3c8a1cde1080889fb6ac309e262e524ebd1.tar.bz2
drakx-4a89b3c8a1cde1080889fb6ac309e262e524ebd1.tar.xz
drakx-4a89b3c8a1cde1080889fb6ac309e262e524ebd1.zip
reconfigure sound slots at boot time (we should enhance slot filling
by keeping existent module affectation, aka keep user choice if his module for slot X is not the default one)
Diffstat (limited to 'perl-install/standalone/service_harddrake')
-rwxr-xr-xperl-install/standalone/service_harddrake8
1 files changed, 8 insertions, 0 deletions
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index ec0cec734..46d57b320 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -7,6 +7,7 @@ use standalone; #- warning, standalone must be loaded very first, for 'expla
use common;
use interactive;
use harddrake::data;
+use modules;
use Storable qw(store retrieve);
my $invert_do_it = $ARGV[0] eq 'X11' ? 1 : 0;
@@ -15,6 +16,8 @@ my $last_boot_config = $hw_sysconfdir."/previous_hw";
$last_boot_config .= '_X11' if $invert_do_it;
+modules::mergein_conf('/etc/modules.conf');
+
# first run ? if not read old hw config
my $previous_config = -f $last_boot_config && -s $last_boot_config ? Storable::retrieve($last_boot_config) : {};
$previous_config = $$previous_config if ref($previous_config) !~ /HASH/;
@@ -72,4 +75,9 @@ foreach (@harddrake::data::tree) {
# output new hw config
log::explanations("created file $last_boot_config");
Storable::store(\%config, $last_boot_config);
+
+# automatic sound slots configuration
+harddrake::sound::configure_sound_slots();
+modules::write_conf();
+
$in->exit(0);