vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Remove

Browse source 
disk_info_msg (conflicts with gettexting into languages with cases).
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-04-10 20:28:25 +02:00
parent e0fc9e78c1
commit b7f3ac299d
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2010-04-10 Grégoire Sutre <gregoire.sutre@gmail.com>
Add grub-probe support for NetBSD. Add grub-probe support for NetBSD.

6
util/hostdisk.c
View file

@ -1166,11 +1166,9 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
grub_disk_t disk; grub_disk_t disk;
int fd; int fd;
# if !defined(__NetBSD__) # if !defined(__NetBSD__)
const char *disk_info_msg = "geometry";
struct hd_geometry hdg; struct hd_geometry hdg;
typeof (hdg.start) p_offset; typeof (hdg.start) p_offset;
# else /* defined(__NetBSD__) */ # else /* defined(__NetBSD__) */
const char *disk_info_msg = "label";
struct disklabel label; struct disklabel label;
int index; int index;
u_int32_t p_offset; 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); fd = open (os_dev, O_RDONLY);
if (fd == -1) 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); free (name);
return 0; return 0;
} }
@ -1236,7 +1234,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
# endif /* !defined(__NetBSD__) */ # endif /* !defined(__NetBSD__) */
{ {
grub_error (GRUB_ERR_BAD_DEVICE, 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); close (fd);
free (name); free (name);
return 0; return 0;