summaryrefslogtreecommitdiffstats
path: root/isys
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2006-04-26 15:49:47 +0000
committerChris Lumens <clumens@redhat.com>2006-04-26 15:49:47 +0000
commit1b38b61445797bfafaab4dc18b9dad1178506168 (patch)
tree33b5c4856a002a42a6051f46003ce84b9705bbe5 /isys
parentdde9a0905b0aa0c0fdcb1ac506fc0a5d586bf5e2 (diff)
downloadanaconda-1b38b61445797bfafaab4dc18b9dad1178506168.tar.gz
anaconda-1b38b61445797bfafaab4dc18b9dad1178506168.tar.xz
anaconda-1b38b61445797bfafaab4dc18b9dad1178506168.zip
Pass the right types to the socket module to make manual IP configuration work
again.
Diffstat (limited to 'isys')
-rw-r--r--isys/isys.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/isys/isys.py b/isys/isys.py
index 2499f1278..0fc32fd33 100644
--- a/isys/isys.py
+++ b/isys/isys.py
@@ -27,6 +27,7 @@ import iutil
import warnings
import resource
import rhpl
+import struct
import logging
log = logging.getLogger("anaconda")
@@ -387,11 +388,11 @@ def mknod(pathname, mode, dev):
# XXX: Use socket.getnameinfo for ipv6 compatibility
def inet_ntoa (addr):
- return socket.inet_ntoa(addr)
+ return socket.inet_ntoa(struct.pack('l', addr))
def inet_aton (addr):
try:
- return socket.inet_aton(addr)
+ return struct.unpack('L', socket.inet_aton(addr))[0]
except:
raise ValueError