提交 c3c0c103 编写于 作者: A Alessio Sergi

Disable netifaces on *BSDs in general

Segmentation fault on OpenBSD too.
See commit 7cfc223c for more info.
上级 3dddbfdf
......@@ -22,7 +22,7 @@
import socket
import sys
from glances.globals import appname, is_freebsd
from glances.globals import appname, is_bsd
from glances.logger import logger
try:
......@@ -192,9 +192,9 @@ class GlancesAutoDiscoverClient(object):
except socket.error as e:
logger.error("Cannot start zeroconf: {0}".format(e))
# XXX FreeBSD: Segmentation fault (core dumped)
# XXX *BSDs: Segmentation fault (core dumped)
# -- https://bitbucket.org/al45tair/netifaces/issues/15
if not is_freebsd:
if not is_bsd:
try:
# -B @ overwrite the dynamic IPv4 choice
if zeroconf_bind_address == '0.0.0.0':
......
......@@ -20,13 +20,13 @@
"""IP plugin."""
from glances.compat import iterkeys
from glances.globals import is_freebsd
from glances.globals import is_bsd
from glances.logger import logger
from glances.plugins.glances_plugin import GlancesPlugin
# XXX FreeBSD: Segmentation fault (core dumped)
# XXX *BSDs: Segmentation fault (core dumped)
# -- https://bitbucket.org/al45tair/netifaces/issues/15
if not is_freebsd:
if not is_bsd:
try:
import netifaces
netifaces_tag = True
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册