Bug#939799: hw-detect: remove floppy support

[Miguel Figueiredo <elmig@debianpt.org>]

Package: hw-detect
Version: 1.138
tags: patch

in attachment, patch to remove floppy support from the hw-detect package.

--
Best regards / Melhores cumprimentos,

Miguel Figueiredo

diff --git a/debian/hw-detect.templates b/debian/hw-detect.templates
index c413e88e..b9854bd1 100644
--- a/debian/hw-detect.templates
+++ b/debian/hw-detect.templates
@@ -74,7 +74,7 @@ Default: false
 # :sl2:
 _Description: Load missing drivers from removable media?
  A driver for your hardware is not available. You may need
- to load drivers from removable media, such as a USB stick, or driver floppy.
+ to load drivers from removable media, such as a USB stick.
  .
  If you have such media available now, insert it, and continue.
 
@@ -84,8 +84,7 @@ Default: true
 # :sl2:
 _Description: Load missing firmware from removable media?
  Some of your hardware needs non-free firmware files to operate. The
- firmware can be loaded from removable media, such as a USB stick or
- floppy.
+ firmware can be loaded from removable media, such as a USB stick.
  .
  The missing firmware files are: ${FILES}
  .
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 59c12851..ad3c057d 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -291,7 +291,7 @@ msgstr ""
 #: ../hw-detect.templates:10001
 msgid ""
 "A driver for your hardware is not available. You may need to load drivers "
-"from removable media, such as a USB stick, or driver floppy."
+"from removable media, such as a USB stick."
 msgstr ""
 
 #. Type: boolean
@@ -317,7 +317,7 @@ msgstr ""
 #: ../hw-detect.templates:11001
 msgid ""
 "Some of your hardware needs non-free firmware files to operate. The firmware "
-"can be loaded from removable media, such as a USB stick or floppy."
+"can be loaded from removable media, such as a USB stick."
 msgstr ""
 
 #. Type: boolean
diff --git a/hw-detect.sh b/hw-detect.sh
index c0f785ae..c6b215bb 100755
--- a/hw-detect.sh
+++ b/hw-detect.sh
@@ -107,8 +107,7 @@ load_module() {
 		IFS="$IFS_SAVE"
 	else   
 		log "Error loading '$module'"
-		if [ "$module" != floppy ] && [ "$module" != ide-floppy ] && \
-		   [ "$module" != ide-cd ] && [ "$module" != ide-generic ]; then
+		if [ "$module" != ide-cd ] && [ "$module" != ide-generic ]; then
 			db_subst hw-detect/modprobe_error CMD_LINE_PARAM "modprobe -v $module"
 			db_input medium hw-detect/modprobe_error || [ $? -eq 30 ]
 			db_go
@@ -145,31 +144,13 @@ get_detected_hw_info() {
 	fi
 }
 
-# NewWorld PowerMacs don't want floppy or ide-floppy, and on some models
-# (e.g. G5s) the kernel hangs when loading the module.
-get_floppy_info() {
-	case $SUBARCH in
-		powerpc/powermac_newworld) ;;
-		*) echo "floppy:Linux Floppy" ;;
-	esac
-}
-
-get_ide_floppy_info() {
-	case $SUBARCH in
-		powerpc/powermac_newworld) ;;
-		*) echo "ide-floppy:Linux IDE floppy" ;;
-	esac
-}
-
 # Manually load modules to enable things we can't detect.
 # XXX: This isn't the best way to do this; we should autodetect.
 # The order of these modules are important.
 get_manual_hw_info() {
 	if [ "$LOAD_IDE" ]; then
-		get_floppy_info
 		get_ide_chipset_info
 		echo "ide-generic:Linux IDE support"
-		get_ide_floppy_info
 		echo "ide-disk:Linux ATA DISK"
 		echo "ide-cd:Linux ATAPI CD-ROM"
 	fi
@@ -502,7 +483,7 @@ if [ -d /sys/class/misc/pmu/ ]; then
 fi
 
 # Install eject?
-if [ -n "$(list-devices cd; list-devices maybe-usb-floppy)" ]; then
+if [ -n "$(list-devices cd )" ]; then
 	apt-install eject || true
 fi