From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 10 Apr 2010 18:28:25 +0000 (+0200)
Subject: 	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Remove
X-Git-Tag: 1.99~954
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7f3ac299db3208400d55bd46bd3dee4bdcad123;p=thirdparty%2Fgrub.git

	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Remove
	disk_info_msg (conflicts with gettexting into languages with cases).
---

diff --git a/ChangeLog b/ChangeLog
index f71c37ad0..91115c2ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Remove
+	disk_info_msg (conflicts with gettexting into languages with cases).
+
 2010-04-10  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	Add grub-probe support for NetBSD.
diff --git a/util/hostdisk.c b/util/hostdisk.c
index 8a412da55..79652625d 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -1166,11 +1166,9 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
     grub_disk_t disk;
     int fd;
 # if !defined(__NetBSD__)
-    const char *disk_info_msg = "geometry";
     struct hd_geometry hdg;
     typeof (hdg.start) p_offset;
 # else /* defined(__NetBSD__) */
-    const char *disk_info_msg = "label";
     struct disklabel label;
     int index;
     u_int32_t p_offset;
@@ -1223,7 +1221,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
     fd = open (os_dev, O_RDONLY);
     if (fd == -1)
       {
-	grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' while attempting to get disk %s", os_dev, disk_info_msg);
+	grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' while attempting to get disk geometry", os_dev);
 	free (name);
 	return 0;
       }
@@ -1236,7 +1234,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
 # endif /* !defined(__NetBSD__) */
       {
 	grub_error (GRUB_ERR_BAD_DEVICE,
-		    "cannot get disk %s of `%s'", disk_info_msg, os_dev);
+		    "cannot get disk geometry of `%s'", os_dev);
 	close (fd);
 	free (name);
 	return 0;