diff options
| author | Radek Vykydal <rvykydal@redhat.com> | 2010-05-21 17:22:49 +0200 |
|---|---|---|
| committer | Radek Vykydal <rvykydal@redhat.com> | 2010-05-24 18:53:45 +0200 |
| commit | 60973855b60a187f5461d20f810acb3ce92496c0 (patch) | |
| tree | df9593ee5d7c012ce6c672e885c21e7936b8e446 /isys | |
| parent | cbcb0d07f22f4055dc7feb7269eba12c32da5131 (diff) | |
| download | anaconda-60973855b60a187f5461d20f810acb3ce92496c0.tar.gz anaconda-60973855b60a187f5461d20f810acb3ce92496c0.tar.xz anaconda-60973855b60a187f5461d20f810acb3ce92496c0.zip | |
Use correct NM dbus interfaces (#594716)
Diffstat (limited to 'isys')
| -rwxr-xr-x | isys/isys.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/isys/isys.py b/isys/isys.py index e037112b2..537f32d6f 100755 --- a/isys/isys.py +++ b/isys/isys.py @@ -48,6 +48,8 @@ NM_MANAGER_IFACE = "org.freedesktop.NetworkManager" NM_ACTIVE_CONNECTION_IFACE = "org.freedesktop.NetworkManager.Connection.Active" NM_CONNECTION_IFACE = "org.freedesktop.NetworkManagerSettings.Connection" NM_DEVICE_IFACE = "org.freedesktop.NetworkManager.Device" +NM_IP4CONFIG_IFACE = "org.freedesktop.NetworkManager.IP4Config" +NM_ACCESS_POINT_IFACE = "org.freedesktop.NetworkManager.AccessPoint" NM_STATE_UNKNOWN = 0 NM_STATE_ASLEEP = 1 @@ -338,7 +340,7 @@ def getDeviceProperties(dev=None): device = bus.get_object(NM_SERVICE, path) device_props_iface = dbus.Interface(device, DBUS_PROPS_IFACE) - device_interface = str(device_props_iface.Get(NM_MANAGER_IFACE, "Interface")) + device_interface = str(device_props_iface.Get(NM_DEVICE_IFACE, "Interface")) if dev is None: all[device_interface] = device_props_iface @@ -396,7 +398,7 @@ def getMacAddress(dev): device_macaddr = None try: - device_macaddr = device_props_iface.Get(NM_MANAGER_IFACE, "HwAddress").upper() + device_macaddr = device_props_iface.Get(NM_DEVICE_IFACE, "HwAddress").upper() except dbus.exceptions.DBusException as e: if e.get_dbus_name() != 'org.freedesktop.DBus.Error.InvalidArgs': raise @@ -449,7 +451,7 @@ def getIPAddress(dev): return None # XXX: add support for IPv6 addresses when NM can do that - device_ip4addr = device_props_iface.Get(NM_MANAGER_IFACE, "Ip4Address") + device_ip4addr = device_props_iface.Get(NM_DEVICE_IFACE, "Ip4Address") try: tmp = struct.pack('I', device_ip4addr) |