summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/bootloader.pm15
-rw-r--r--perl-install/install_steps.pm1
2 files changed, 0 insertions, 16 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 56da1f487..5bd8ad18a 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -751,21 +751,6 @@ sub method_choices {
} method_choices_raw();
}
-sub suggest_floppy {
- my ($bootloader) = @_;
-
- my $floppy = detect_devices::floppy() or return;
- $floppy eq 'fd0' or log::l("suggest_floppy: not adding $floppy"), return;
-
- add_entry($bootloader,
- {
- type => 'other',
- kernel_or_dev => '/dev/fd0',
- label => 'floppy',
- unsafe => 1
- });
-}
-
sub keytable {
my ($f) = @_;
$f or return;
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 8f71e7ae7..01fd2f333 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -831,7 +831,6 @@ sub setupBootloaderBefore {
bootloader::suggest($o->{bootloader}, $o->{all_hds}{hds},
vga_fb => ($force_vga || $vga && $need_fb) && $o->{vga},
quiet => $o->{meta_class} ne 'server');
- bootloader::suggest_floppy($o->{bootloader}) if $o->{security} <= 3 && arch() !~ /ppc/;
$o->{bootloader}{keytable} ||= keyboard::keyboard2kmap($o->{keyboard});
}