From 23b49f87a283e308be0d46999485c46678fe88d2 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 23 Sep 2008 19:34:58 +0000
Subject: harddrake: auto-configure floppies

---
 perl-install/NEWS                         | 3 +++
 perl-install/harddrake/autoconf.pm        | 5 +++++
 perl-install/standalone/service_harddrake | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 1cb3ecdd6..326be27b1 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- harddrake: auto-configure floppies
+  (may require to load floppy module at first boot on a new system)
+
 Version 11.51 - 23 September 2008
 
 - finish-install:
diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm
index 4f234010d..0f7eb33c3 100644
--- a/perl-install/harddrake/autoconf.pm
+++ b/perl-install/harddrake/autoconf.pm
@@ -83,6 +83,11 @@ 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;
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index fbe854c2b..3ebfdb1ba 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -211,6 +211,8 @@ foreach my $hw_class (@harddrake::data::tree) {
         next;
     } elsif ($Ident eq "CPU") {
         harddrake::autoconf::cpufreq();
+    } elsif ($Ident eq "FLOPPY") {
+        harddrake::autoconf::floppy();
     }
 
     next if $is_globetrotter && !$hw_class->{automatic};
-- 
cgit v1.2.1