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

Fixes for kernel of FreeBSD:

Browse source 
* grub/asmstub.c (get_diskinfo): Toggle "kern.geom.debugflags" sysctl
        before opening a device for writing.
        * util/grub-install.in: Devices don't have this "r" prefix anymore.
This commit is contained in:
robertmh 2006-04-20 13:46:46 +00:00
parent 8a4848921a
commit 4ace38464e
3 changed files with 41 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-04-20 Robert Millan <robertmh@gnu.org>
Fixes for kernel of FreeBSD:
* grub/asmstub.c (get_diskinfo): Toggle "kern.geom.debugflags" sysctl
before opening a device for writing.
* util/grub-install.in: Devices don't have this "r" prefix anymore.
2006-04-16 Yoshinori K. Okuji <okuji@enbug.org> 2006-04-16 Yoshinori K. Okuji <okuji@enbug.org>
* docs/multiboot.texi: Correct the offset of address * docs/multiboot.texi: Correct the offset of address

33
grub/asmstub.c
View file

@ -55,6 +55,10 @@ int grub_stage2 (void);
# endif /* ! BLKFLSBUF */ # endif /* ! BLKFLSBUF */
#endif /* __linux__ */ #endif /* __linux__ */
#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
# include <sys/sysctl.h>
#endif
/* We want to prevent any circularararity in our stubs, as well as /* We want to prevent any circularararity in our stubs, as well as
libc name clashes. */ libc name clashes. */
#define WITHOUT_LIBC_STUBS 1 #define WITHOUT_LIBC_STUBS 1
@ -777,7 +781,34 @@ get_diskinfo (int drive, struct geometry *geometry)
/* Open read/write, or read-only if that failed. */ /* Open read/write, or read-only if that failed. */
if (! read_only) if (! read_only)
disks[drive].flags = open (devname, O_RDWR); {
/* By default, kernel of FreeBSD does not allow overwriting MBR */
#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
#define GEOM_SYSCTL "kern.geom.debugflags"
int old_flags, flags;
size_t sizeof_int = sizeof (int);
if (sysctlbyname (GEOM_SYSCTL, &old_flags, &sizeof_int, NULL, 0) != 0)
grub_printf ("failed to get " GEOM_SYSCTL "sysctl: %s\n", strerror (errno));
if ((old_flags & 0x10) == 0)
{
/* "allow foot shooting", see geom(4) */
flags = old_flags | 0x10;
if (sysctlbyname (GEOM_SYSCTL, NULL, NULL, &flags, sizeof (int)) != 0)
grub_printf ("failed to set " GEOM_SYSCTL "sysctl: %s\n", strerror (errno));
}
#endif
disks[drive].flags = open (devname, O_RDWR);
#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
if (flags != old_flags)
{
if (sysctlbyname (GEOM_SYSCTL, NULL, NULL, &old_flags, sizeof (int)) != 0)
grub_printf ("failed to set " GEOM_SYSCTL "sysctl: %s\n", strerror (errno));
}
#endif
}
if (disks[drive].flags == -1) if (disks[drive].flags == -1)
{ {

4
util/grub-install.in
View file

@ -112,8 +112,8 @@ convert () {
tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'` tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`
tmp_part=`echo "$1" | sed "s%$tmp_disk%%"` ;; tmp_part=`echo "$1" | sed "s%$tmp_disk%%"` ;;
freebsd* | kfreebsd*-gnu) freebsd* | kfreebsd*-gnu)
tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([saw]d[0-9]*\).*$%r\1%' \ tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([saw]d[0-9]*\).*$%\1%' \
| sed 's%r\{0,1\}\(da[0-9]*\).*$%r\1%'` | sed 's%r\{0,1\}\(da[0-9]*\).*$%\1%'`
tmp_part=`echo "$1" \ tmp_part=`echo "$1" \
| sed "s%.*/r\{0,1\}[saw]d[0-9]\(s[0-9]*[a-h]\)%\1%" \ | sed "s%.*/r\{0,1\}[saw]d[0-9]\(s[0-9]*[a-h]\)%\1%" \
| sed "s%.*/r\{0,1\}da[0-9]\(s[0-9]*[a-h]\)%\1%"` | sed "s%.*/r\{0,1\}da[0-9]\(s[0-9]*[a-h]\)%\1%"`