From 52145f760851160ced67b00f1ff10449e7b85b31 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Wed, 22 Oct 2008 06:13:55 +0000
Subject: [PATCH] Don't show floppies if missing

---
 fdisk/fdisk-lib.pl | 3 ++-
 fdisk/lang/en      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fdisk/fdisk-lib.pl b/fdisk/fdisk-lib.pl
index 7131efb59..7f95a245c 100644
--- a/fdisk/fdisk-lib.pl
+++ b/fdisk/fdisk-lib.pl
@@ -875,7 +875,8 @@ sub partition_select
 {
 local $rv = "<select name=$_[0]>\n";
 local ($found, $d, $p);
-if ($_[2] == 0 || $_[2] == 2) {
+if (($_[2] == 0 || $_[2] == 2) &&
+    (-r "/dev/fd0" || $_[1] =~ /^\/dev\/fd[01]$/)) {
 	$rv .= sprintf "<option %s value=/dev/fd0>%s\n",
 		$_[1] eq "/dev/fd0" ? "selected" : "",
 		&text('select_fd', 0) if (!$_[4] || "/dev/fd0" =~ /$_[4]/);
diff --git a/fdisk/lang/en b/fdisk/lang/en
index c43ccf91d..d5f45ffd5 100644
--- a/fdisk/lang/en
+++ b/fdisk/lang/en
@@ -236,12 +236,12 @@ log_tunefs=Tuned $1 filesystem on $2
 log_fsck=Repaired $1 filesystem on $2
 log_hdparm=Modified IDE parameters for $1
 
-fs_ext2=Linux Native
+fs_ext2=Old Linux Native
 fs_minix=Minix
 fs_msdos=MS-DOS
 fs_vfat=Windows
 fs_reiserfs=ReiserFS
-fs_ext3=New Linux Native
+fs_ext3=Linux Native
 fs_xfs=SGI
 fs_jfs=IBM Journalling