]> git.proxmox.com Git - mirror_ifupdown2.git/commitdiff
Fix error message on ifquery when sysctl bridge-stp-user-space
authorAlexandre Derumier <aderumier@odiso.com>
Mon, 3 Jun 2019 09:45:27 +0000 (11:45 +0200)
committerAlexandre Derumier <aderumier@odiso.com>
Mon, 3 Jun 2019 09:45:27 +0000 (11:45 +0200)
This fix this kind of error:

error: bond0: cmd '/sbin/sysctl net.bridge.bridge-stp-user-space' failed: returned 255 (sysctl: cannot stat /proc/sys/net/bridge/bridge-stp-user-space: No such file or directory
)
error: fwpr103p0: cmd '/sbin/sysctl net.bridge.bridge-stp-user-space' failed: returned 255 (sysctl: cannot stat /proc/sys/net/bridge/bridge-stp-user-space: No such file or directory
)

ifupdown2/ifupdownaddons/modulebase.py

index d0169f33ff4d05f941253cb9334a6c942e11ca76..4b9853d94f82c85896f92ccafe7f1ff50e504ef7 100644 (file)
@@ -322,7 +322,11 @@ class moduleBase(object):
     def systcl_get_net_bridge_stp_user_space(self):
         if self._bridge_stp_user_space:
             return self._bridge_stp_user_space
-        self._bridge_stp_user_space = self.sysctl_get('net.bridge.bridge-stp-user-space')
+        try:
+            self._bridge_stp_user_space = self.sysctl_get('net.bridge.bridge-stp-user-space')
+        except:
+            self._bridge_stp_user_space = 0
+
         return self._bridge_stp_user_space
 
     def set_iface_attr(self, ifaceobj, attr_name, attr_valsetfunc,