summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2013-05-07 00:06:35 +0000
committerOlivier Blin <blino@mageia.org>2013-05-07 00:06:35 +0000
commit143d3ab2c504dfaba60b92ce5e86fc9fd5a432a6 (patch)
tree181374b7924cf317a75f81307fe5f2e039818638
parent7536655d2d15238c26ff5e084dfe4d08e34b9ef7 (diff)
downloaddrakx-143d3ab2c504dfaba60b92ce5e86fc9fd5a432a6.tar
drakx-143d3ab2c504dfaba60b92ce5e86fc9fd5a432a6.tar.gz
drakx-143d3ab2c504dfaba60b92ce5e86fc9fd5a432a6.tar.bz2
drakx-143d3ab2c504dfaba60b92ce5e86fc9fd5a432a6.tar.xz
drakx-143d3ab2c504dfaba60b92ce5e86fc9fd5a432a6.zip
harddrake: do not disable bluetooth service if adapter disappears (for
example if disabled by Fn keys), systemd will automatically disable the service if needed
-rw-r--r--perl-install/NEWS5
-rw-r--r--perl-install/harddrake/autoconf.pm5
2 files changed, 10 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index d9f36ae1a..50c1efc0f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,8 @@
+- harddrake:
+ o do not disable bluetooth service if adapter disappears
+ (for example if disabled by Fn keys)
+ systemd will automatically disable the service if needed
+
Version 15.47 - 30 April 2013
- skip comments in /etc/crypttab (Colin, mga#9905)
diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm
index 002d562bb..0fd4c9957 100644
--- a/perl-install/harddrake/autoconf.pm
+++ b/perl-install/harddrake/autoconf.pm
@@ -46,6 +46,11 @@ sub pcmcia {
sub bluetooth {
my ($enable) = @_;
+ # do not disable bluetooth service if adapter disappears
+ # (for example if disabled by Fn keys)
+ # systemd will automatically disable the service if needed
+ return if !$enable;
+
#- FIXME: make sure these packages are installed when needed
# if ($enable) {
# require do_pkgs;