|
 |
6cb3e9 |
From d51756af3dafa2d09ed8f351a48431333318ba31 Mon Sep 17 00:00:00 2001
|
|
|
6cb3e9 |
From: Lumir Balhar <lbalhar@redhat.com>
|
|
|
6cb3e9 |
Date: Wed, 7 Nov 2018 11:54:43 +0100
|
|
|
6cb3e9 |
Subject: [PATCH] Fix issue when interface has no IPv4 address assigned.
|
|
|
6cb3e9 |
|
|
|
6cb3e9 |
---
|
|
|
6cb3e9 |
scripts/pifconfig | 19 +++++++++++++------
|
|
|
6cb3e9 |
1 file changed, 13 insertions(+), 6 deletions(-)
|
|
|
6cb3e9 |
mode change 100755 => 100644 scripts/pifconfig
|
|
|
6cb3e9 |
|
|
|
6cb3e9 |
diff --git a/scripts/pifconfig b/scripts/pifconfig
|
|
|
6cb3e9 |
old mode 100755
|
|
|
6cb3e9 |
new mode 100644
|
|
|
6cb3e9 |
index d1bcdb4..f2b0707
|
|
|
6cb3e9 |
--- a/scripts/pifconfig
|
|
|
6cb3e9 |
+++ b/scripts/pifconfig
|
|
|
6cb3e9 |
@@ -60,16 +60,23 @@ def flags2str(flags):
|
|
|
6cb3e9 |
|
|
|
6cb3e9 |
|
|
|
6cb3e9 |
def show_config(device):
|
|
|
6cb3e9 |
- ipaddr = ethtool.get_ipaddr(device)
|
|
|
6cb3e9 |
- netmask = ethtool.get_netmask(device)
|
|
|
6cb3e9 |
+ try:
|
|
|
6cb3e9 |
+ ipaddr = ethtool.get_ipaddr(device)
|
|
|
6cb3e9 |
+ netmask = ethtool.get_netmask(device)
|
|
|
6cb3e9 |
+ broadcast = ethtool.get_broadcast(device)
|
|
|
6cb3e9 |
+ except (IOError, OSError):
|
|
|
6cb3e9 |
+ ipaddr, netmask, broadcast = None, None, None
|
|
|
6cb3e9 |
flags = ethtool.get_flags(device)
|
|
|
6cb3e9 |
print('%s' % device)
|
|
|
6cb3e9 |
if not (flags & ethtool.IFF_LOOPBACK):
|
|
|
6cb3e9 |
print('\tHWaddr %s' % ethtool.get_hwaddr(device))
|
|
|
6cb3e9 |
- print('\tinet addr:%s' % ipaddr)
|
|
|
6cb3e9 |
- if not (flags & (ethtool.IFF_LOOPBACK | ethtool.IFF_POINTOPOINT)):
|
|
|
6cb3e9 |
- print('\tBcast:%s' % ethtool.get_broadcast(device))
|
|
|
6cb3e9 |
- print('\tMask:%s' % netmask)
|
|
|
6cb3e9 |
+ if ipaddr is not None:
|
|
|
6cb3e9 |
+ print('\tinet addr:%s' % ipaddr)
|
|
|
6cb3e9 |
+ if broadcast is not None and \
|
|
|
6cb3e9 |
+ not (flags & (ethtool.IFF_LOOPBACK | ethtool.IFF_POINTOPOINT)):
|
|
|
6cb3e9 |
+ print('\tBcast:%s' % broadcast)
|
|
|
6cb3e9 |
+ if netmask is not None:
|
|
|
6cb3e9 |
+ print('\tMask:%s' % netmask)
|
|
|
6cb3e9 |
for info in ethtool.get_interfaces_info(device):
|
|
|
6cb3e9 |
for addr in info.get_ipv6_addresses():
|
|
|
6cb3e9 |
print('\tinet6 addr: %s/%s Scope: %s'
|
|
|
6cb3e9 |
--
|
|
|
6cb3e9 |
2.19.1
|
|
|
6cb3e9 |
|