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

2009-07-19 Yves BLUSSEAU <yves.grub-devel@zetam.org>

Browse source 
* util/getroot.c (find_root_device): Add support for MacOSX.
	* util/hostdisk.c: Likewise.
This commit is contained in:
proski 2009-07-20 20:03:18 +00:00
parent 75421ca9ea
commit 4f253044ec
3 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-07-19 Yves BLUSSEAU <yves.grub-devel@zetam.org>
* util/getroot.c (find_root_device): Add support for MacOSX.
* util/hostdisk.c: Likewise.
2009-07-20 Vladimir Serbinenko <phcoder@gmail.com> 2009-07-20 Vladimir Serbinenko <phcoder@gmail.com>
* font/font.c (find_glyph): Check whether a font is present to avoid * font/font.c (find_glyph): Check whether a font is present to avoid

2
util/getroot.c
View file

@ -238,7 +238,7 @@ find_root_device (const char *dir, dev_t dev)
} }
} }
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
if (S_ISCHR (st.st_mode) && st.st_rdev == dev) if (S_ISCHR (st.st_mode) && st.st_rdev == dev)
#else #else
if (S_ISBLK (st.st_mode) && st.st_rdev == dev) if (S_ISBLK (st.st_mode) && st.st_rdev == dev)

28
util/hostdisk.c
View file

@ -92,6 +92,10 @@ struct hd_geometry
# include <sys/sysctl.h> # include <sys/sysctl.h>
#endif #endif
#if defined(__APPLE__)
# include <sys/disk.h>
#endif
struct struct
{ {
char *drive; char *drive;
@ -185,7 +189,8 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
#elif defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #elif defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
defined(__FreeBSD_kernel__) || defined(__APPLE__)
{ {
unsigned long long nr; unsigned long long nr;
int fd; int fd;
@ -194,7 +199,7 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
if (fd == -1) if (fd == -1)
return grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' while attempting to get disk size", map[drive].device); return grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' while attempting to get disk size", map[drive].device);
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
if (fstat (fd, &st) < 0 || ! S_ISCHR (st.st_mode)) if (fstat (fd, &st) < 0 || ! S_ISCHR (st.st_mode))
# else # else
if (fstat (fd, &st) < 0 || ! S_ISBLK (st.st_mode)) if (fstat (fd, &st) < 0 || ! S_ISBLK (st.st_mode))
@ -206,6 +211,8 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
if (ioctl (fd, DIOCGMEDIASIZE, &nr)) if (ioctl (fd, DIOCGMEDIASIZE, &nr))
# elif defined(__APPLE__)
if (ioctl (fd, DKIOCGETBLOCKCOUNT, &nr))
# else # else
if (ioctl (fd, BLKGETSIZE64, &nr)) if (ioctl (fd, BLKGETSIZE64, &nr))
# endif # endif
@ -215,10 +222,15 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
} }
close (fd); close (fd);
#if defined (__APPLE__)
disk->total_sectors = nr;
#else
disk->total_sectors = nr / 512; disk->total_sectors = nr / 512;
if (nr % 512) if (nr % 512)
grub_util_error ("unaligned device size"); grub_util_error ("unaligned device size");
#endif
grub_util_info ("the size of %s is %llu", name, disk->total_sectors); grub_util_info ("the size of %s is %llu", name, disk->total_sectors);
@ -371,6 +383,12 @@ open_device (const grub_disk_t disk, grub_disk_addr_t sector, int flags)
} }
#endif #endif
#if defined(__APPLE__)
/* If we can't have exclusive access, try shared access */
if (fd < 0)
fd = open(map[disk->id].device, flags | O_SHLOCK);
#endif
if (fd < 0) if (fd < 0)
{ {
grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' in open_device()", map[disk->id].device); grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' in open_device()", map[disk->id].device);
@ -811,7 +829,7 @@ convert_system_partition_to_system_disk (const char *os_dev)
path[8] = 0; path[8] = 0;
return path; return path;
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
char *path = xstrdup (os_dev); char *path = xstrdup (os_dev);
if (strncmp ("/dev/", path, 5) == 0) if (strncmp ("/dev/", path, 5) == 0)
{ {
@ -890,7 +908,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
== 0) == 0)
return make_device_name (drive, -1, -1); return make_device_name (drive, -1, -1);
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
if (! S_ISCHR (st.st_mode)) if (! S_ISCHR (st.st_mode))
#else #else
if (! S_ISBLK (st.st_mode)) if (! S_ISBLK (st.st_mode))
@ -1039,7 +1057,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
return make_device_name (drive, dos_part, bsd_part); return make_device_name (drive, dos_part, bsd_part);
} }
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
/* FreeBSD uses "/dev/[a-z]+[0-9]+(s[0-9]+[a-z]?)?". */ /* FreeBSD uses "/dev/[a-z]+[0-9]+(s[0-9]+[a-z]?)?". */
{ {
int dos_part = -1; int dos_part = -1;