backport laptop/bluetooth/firewire autoconf fixes/features from HEAD

1 files changed, 30 insertions, 0 deletions

diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm
index b451286df..09ab89e55 100644
--- a/perl-install/harddrake/autoconf.pm
+++ b/perl-install/harddrake/autoconf.pm
@@ -43,4 +43,34 @@ sub pcmcia {
     });
 }
 
+sub bluetooth {
+    my ($enable) = @_;
+#     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);
+}
+
+sub laptop {
+    my ($on_laptop) = @_;
+#     require do_pkgs;
+#     my $do_pkgs = do_pkgs_standalone->new;
+#     if ($on_laptop) {
+#         $do_pkgs->ensure_is_installed("cpufreq", "/etc/rc.d/init.d/cpufreq");
+#         $do_pkgs->ensure_is_installed("apmd", "/usr/bin/apm");
+#         $do_pkgs->ensure_is_installed("hotkeys", "/usr/bin/hotkeys");
+#         $do_pkgs->ensure_is_installed("laptop-mode-tools", "/usr/sbin/laptop_mode");
+#     } else {
+#         $do_pkgs->ensure_is_installed("numlock", "/etc/rc.d/init.d/numlock");
+#     }
+    require services;
+    services::set_status("cpufreq", $on_laptop);
+    services::set_status("apmd", $on_laptop);
+    services::set_status("laptop-mode", $on_laptop);
+    services::set_status("numlock", !$on_laptop);
+}
+
 1;