summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2006-03-03 17:06:15 +0000
committerOlivier Blin <oblin@mandriva.org>2006-03-03 17:06:15 +0000
commitb8bd775b5130b77409ed25512c7cb98176e5a6a1 (patch)
tree6ea123ee4927ca2eeb8d6892609fd378b8330667
parent0f38a5dbb601e370650f524d65b17e249028dca5 (diff)
downloaddrakx-backup-do-not-use-b8bd775b5130b77409ed25512c7cb98176e5a6a1.tar
drakx-backup-do-not-use-b8bd775b5130b77409ed25512c7cb98176e5a6a1.tar.gz
drakx-backup-do-not-use-b8bd775b5130b77409ed25512c7cb98176e5a6a1.tar.bz2
drakx-backup-do-not-use-b8bd775b5130b77409ed25512c7cb98176e5a6a1.tar.xz
drakx-backup-do-not-use-b8bd775b5130b77409ed25512c7cb98176e5a6a1.zip
autoconf bluetooth controllers (enable bluetooth service)
-rw-r--r--perl-install/harddrake/autoconf.pm12
-rw-r--r--perl-install/harddrake/data.pm2
-rwxr-xr-xperl-install/standalone/service_harddrake2
3 files changed, 15 insertions, 1 deletions
diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm
index b451286df..85be3ea4b 100644
--- a/perl-install/harddrake/autoconf.pm
+++ b/perl-install/harddrake/autoconf.pm
@@ -43,4 +43,16 @@ sub pcmcia {
});
}
+sub bluetooth {
+ my ($enable) = @_;
+#- FIXME: make sure these packages are installed when needed
+# if ($enable) {
+# require do_pkgs;
+# my $do_pkgs = do_pkgs_standalone->new;
+# $do_pkgs->ensure_is_installed("bluez-utils", "/usr/bin/rfcomm");
+# }
+ require services;
+ services::set_status("bluetooth", $enable);
+}
+
1;
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 68fc2b738..f0c54e683 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -257,7 +257,7 @@ our @tree =
icon => "hw_network.png",
configurator => "",
detector => sub { f(modules::probe_category('bus/bluetooth')) },
- checked_on_boot => 0,
+ checked_on_boot => 1,
},
{
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 0cbc1258a..535e6f753 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -163,6 +163,8 @@ foreach my $hw_class (@harddrake::data::tree) {
$modules_conf->write;
modules::load(difference2(\@new_drivers, \@old_drivers));
next;
+ } elsif ($Ident eq "BLUETOOTH") {
+ harddrake::autoconf::bluetooth(scalar keys %ID);
} elsif ($Ident eq "PCMCIA_CONTROLLER") {
# obsolete once/since kernel-2.6.14/pcmciautils is used, but kept for compatibility:
harddrake::autoconf::pcmcia(keys %ID ? first(values(%ID))->{driver} : '');