1 files changed, 76 insertions, 7 deletions

diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm
index 9b16f5d3c..fba5078cd 100644
--- a/perl-install/harddrake/autoconf.pm
+++ b/perl-install/harddrake/autoconf.pm
@@ -3,7 +3,7 @@ package harddrake::autoconf;
 use common;
 
 sub xconf {
-    my ($modules_conf, $o) = @_;
+    my ($modules_conf, $o, $o_skip_fb_setup, $o_resolution_wanted) = @_;
 
     log::l('automatic XFree configuration');
     
@@ -12,8 +12,10 @@ sub xconf {
     my $do_pkgs = do_pkgs_standalone->new;
     $o->{raw_X} = Xconfig::default::configure($do_pkgs);
     
+    my $old_x = { if_($o_resolution_wanted, resolution_wanted => $o_resolution_wanted) };
+
     require Xconfig::main;
-    Xconfig::main::configure_everything_auto_install($o->{raw_X}, $do_pkgs, {}, { allowFB => listlength(cat_("/proc/fb")) });
+    Xconfig::main::configure_everything_auto_install($o->{raw_X}, $do_pkgs, $old_x, { allowFB => listlength(cat_("/proc/fb")), skip_fb_setup => $o_skip_fb_setup });
 
     #- always disable compositing desktop effects when configuring a new video card
     require Xconfig::glx;
@@ -22,10 +24,43 @@ sub xconf {
     modules::load_category($modules_conf, 'various/agpgart'); 
 }
 
+sub setup_ethernet_device {
+    my ($in, $device) = @_;
+
+    require network::connection;
+    require network::connection::ethernet;
+    require network::connection::wireless;
+    my @connection_types = qw(network::connection::ethernet  network::connection::wireless);
+    my @all_connections = map { $_->get_connections(automatic_only => 1) } @connection_types;
+    my $interface = network::connection::ethernet::device_to_interface($device)
+      or return;
+    my $connection = find { $_->get_interface eq $interface } @all_connections
+      or return;
+
+    require network::connection_manager;
+    my $net = {};
+    network::network::read_net_conf($net);
+    my $cmanager = network::connection_manager->new($in, $net);
+    $cmanager->set_connection($connection);
+
+    # this will installed required packages
+    $cmanager->setup_connection;
+}
+
 sub network_conf {
-    my ($obj) = @_;
-    require network::network;
-    network::network::easy_dhcp($obj->{net}, $obj->{modules_conf});
+    my ($modules_conf, $in, $added) = @_;
+    $modules_conf->remove_alias_regexp('^(wlan|eth)[0-9]*$');
+    modules::load_category($modules_conf, 'network/main|gigabit|usb|wireless|firewire|pcmcia');
+
+    setup_ethernet_device($in, $_) foreach @{$added || {}};
+
+    require network::connection::ethernet;
+    network::connection::ethernet::configure_eth_aliases($modules_conf);
+    require network::rfswitch;
+    network::rfswitch::configure();
+    require network::shorewall;
+    network::shorewall::update_interfaces_list();
+    $modules_conf->write;
 }
 
 sub mouse_conf {
@@ -44,6 +79,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;
@@ -72,8 +112,7 @@ sub laptop {
 #         $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("apmd", -e "/proc/apm");
     services::set_status("laptop-mode", $on_laptop);
     services::set_status("numlock", !$on_laptop);
 }
@@ -83,4 +122,34 @@ sub cpufreq() {
     modules::set_preload_modules("cpufreq", cpufreq::get_modules());
 }
 
+sub floppy() {
+    require detect_devices;
+    modules::set_preload_modules("floppy", if_(detect_devices::floppy(), "floppy"));
+}
+
+sub fix_aliases {
+    my ($modules_conf) = @_;
+    require modalias;
+    my %new_aliases;
+    #- first pass: find module targets whose modalias is not valid anymore
+    foreach my $module ($modules_conf->modules) {
+	if (my $aliased_to = $modules_conf->get_alias($module)) {
+	    my @valid_modaliases = modalias::get_modules($module, 'skip_config') or next;
+	    my ($found, $others) = partition { $_ eq $aliased_to } @valid_modaliases;
+	    $new_aliases{$aliased_to} = @{$others || []} == 1 && $others->[0] if is_empty_array_ref($found);
+	}
+    }
+    #- second pass: adapt module targets that are not valid anymore
+    foreach my $module ($modules_conf->modules) {
+	if (my $aliased_to = $modules_conf->get_alias($module)) {
+	    if (my $new = exists $new_aliases{$aliased_to} && $new_aliases{$aliased_to}) {
+		$modules_conf->set_alias($module, $new);
+	    } else {
+		$modules_conf->remove_alias($module);
+	    }
+	}
+    }
+    $modules_conf->write;
+}
+
 1;