Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Under Linux use BLKGETSIZE64 to get the device size, now, and only when that

Browse Source 
fails fall back to HDIO_GETGEO. This hopefully fixes #3122, as I suspect
HDIO_GETGEO returned an incorrect size.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32674 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2009-08-25 20:31:21 +00:00
parent 33a4f0109b
commit fb7c02c215
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/makebootable/platform/bios_ia32/makebootable.cpp
View File

@ -23,6 +23,7 @@
// Linux and FreeBSD support
#ifdef HAIKU_HOST_PLATFORM_LINUX
# include <ctype.h>
# include <linux/fs.h>
# include <linux/hdreg.h>
# include <sys/ioctl.h>
@ -489,16 +490,22 @@ main(int argc, const char *const *argv)
exit(1);
}
// get device geometry
// get device size -- try BLKGETSIZE64, but, if it doesn't
// work, fall back to the obsolete HDIO_GETGEO
int64 deviceSize;
hd_geometry geometry;
if (ioctl(baseFD, HDIO_GETGEO, &geometry) < 0) {
if (ioctl(baseFD, BLKGETSIZE64, &deviceSize) == 0
&& deviceSize > 0) {
// looks good
} else if (ioctl(baseFD, HDIO_GETGEO, &geometry) == 0) {
deviceSize = (int64)geometry.heads * geometry.sectors
* geometry.cylinders * 512;
} else {
fprintf(stderr, "Error: Failed to get device geometry "
"for \"%s\": %s\n", baseDeviceName,
strerror(errno));
exit(1);
}
int64 deviceSize = (int64)geometry.heads * geometry.sectors
* geometry.cylinders * 512;
// parse the partition map
// TODO: block size!