011fe8
From 97fca4331e317b0491912c3cf3d02a9fac96c419 Mon Sep 17 00:00:00 2001
78a3d7
From: Colin Watson <cjwatson@ubuntu.com>
78a3d7
Date: Fri, 17 Jan 2014 02:28:46 +0000
58fe9a
Subject: [PATCH 035/152] Ignore EPERM when modifying kern.geom.debugflags
78a3d7
78a3d7
Many tests fail when run as a non-root user on FreeBSD.  The failures
78a3d7
all amount to an inability to open files using grub_util_fd_open,
78a3d7
because we cannot set the kern.geom.debugflags sysctl.  This sysctl is
78a3d7
indeed important to allow us to do such things as installing GRUB to the
78a3d7
MBR, but if we need to do that and can't then we will get an error
78a3d7
later.  Enforcing it here is unnecessary and prevents otherwise
78a3d7
perfectly reasonable operations.
78a3d7
---
78a3d7
 ChangeLog                          |  7 +++++++
78a3d7
 grub-core/osdep/freebsd/hostdisk.c | 12 ++++++++++--
78a3d7
 2 files changed, 17 insertions(+), 2 deletions(-)
78a3d7
78a3d7
diff --git a/ChangeLog b/ChangeLog
011fe8
index 4688ff4..10abfe2 100644
78a3d7
--- a/ChangeLog
78a3d7
+++ b/ChangeLog
78a3d7
@@ -1,3 +1,10 @@
78a3d7
+2014-01-19  Colin Watson  <cjwatson@ubuntu.com>
78a3d7
+
78a3d7
+	* grub-core/osdep/freebsd/hostdisk.c (grub_util_fd_open): Ignore
78a3d7
+	EPERM when modifying kern.geom.debugflags.  It is only a problem for
78a3d7
+	such things as installing GRUB to the MBR, in which case there'll be
78a3d7
+	an error later anyway, not for opening files during tests.
78a3d7
+
78a3d7
 2014-01-18  Andrey Borzenkov <arvidjaar@gmail.com>
78a3d7
 
78a3d7
 	* grub-core/Makefile.am: Build grub_emu_init.[ch] from MODULE_FILES
78a3d7
diff --git a/grub-core/osdep/freebsd/hostdisk.c b/grub-core/osdep/freebsd/hostdisk.c
78a3d7
index eb202dc..6145d07 100644
78a3d7
--- a/grub-core/osdep/freebsd/hostdisk.c
78a3d7
+++ b/grub-core/osdep/freebsd/hostdisk.c
78a3d7
@@ -102,8 +102,16 @@ grub_util_fd_open (const char *os_dev, int flags)
78a3d7
   if (! (sysctl_oldflags & 0x10)
78a3d7
       && sysctlbyname ("kern.geom.debugflags", NULL , 0, &sysctl_flags, sysctl_size))
78a3d7
     {
78a3d7
-      grub_error (GRUB_ERR_BAD_DEVICE, "cannot set flags of sysctl kern.geom.debugflags");
78a3d7
-      return GRUB_UTIL_FD_INVALID;
78a3d7
+      if (errno == EPERM)
78a3d7
+	/* Running as an unprivileged user; don't worry about restoring
78a3d7
+	   flags, although if we try to write to anything interesting such
78a3d7
+	   as the MBR then we may fail later.  */
78a3d7
+	sysctl_oldflags = 0x10;
78a3d7
+      else
78a3d7
+	{
78a3d7
+	  grub_error (GRUB_ERR_BAD_DEVICE, "cannot set flags of sysctl kern.geom.debugflags");
78a3d7
+	  return GRUB_UTIL_FD_INVALID;
78a3d7
+	}
78a3d7
     }
78a3d7
 
78a3d7
   ret = open (os_dev, flags, S_IROTH | S_IRGRP | S_IRUSR | S_IWUSR);
78a3d7
-- 
37b39b
1.9.3
78a3d7