From dcb98890bf3ca1c0e166bccb5ed8b313695bf507 Mon Sep 17 00:00:00 2001 From: Peter Grehan Date: Mon, 20 Jul 2015 08:42:54 -0700 Subject: [PATCH] Disable the unconditional opening of /dev/tap0. This was more of an experiment, but it results in the tap interface being created if it didn't exist which isn't a desirable side effect. This is easy to re-enable if it turns out people are using networking in grub-bhyve. (issue from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=200710) --- grub-core/net/drivers/emu/emunet.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/grub-core/net/drivers/emu/emunet.c b/grub-core/net/drivers/emu/emunet.c index b656107..2defae9 100644 --- a/grub-core/net/drivers/emu/emunet.c +++ b/grub-core/net/drivers/emu/emunet.c @@ -114,9 +114,15 @@ GRUB_MOD_INIT(emunet) } #endif #ifdef __FreeBSD__ - fd = open ("/dev/tap0", O_RDWR | O_NONBLOCK); - if (fd < 0) - return; + /* + * To experiment with this on FreeBSD on a tap device, use the + * following code fragment: + * fd = open ("/dev/tap0", O_RDWR | O_NONBLOCK); + * if (fd < 0) + * return; + */ + fd = -1; + return; #endif grub_net_card_register (&emucard); }