2005-05-23 Jeremy Katz <katzj@redhat.com>

	* isys/isys.py (oldSwapLabelMunge): Munge old swap label format to
	the new version.  Elliot's first pass wasn't accepted upstream so
	we need to try to do some conversion.  We should probably nuke
	this code for FC5 or FC6.

2 files changed, 42 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 84e88f56e..b5b8c709e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-05-23  Jeremy Katz  <katzj@redhat.com>
 
+	* isys/isys.py (oldSwapLabelMunge): Munge old swap label format to
+	the new version.  Elliot's first pass wasn't accepted upstream so
+	we need to try to do some conversion.  We should probably nuke
+	this code for FC5 or FC6.
+
 	* bootloader.py (writeBootloader): Only update the default if
 	we're setting the default to linux (#156678)
 
diff --git a/isys/isys.py b/isys/isys.py
index 6db63e9ba..2d1f89cee 100644
--- a/isys/isys.py
+++ b/isys/isys.py
@@ -663,12 +663,48 @@ def readSwapLabel_int(device):
         label = string.rstrip(buf[1052:1068], "\0x00")
     return label
 
+# FIXME: we should probably remove this after a release just to avoid
+# breaking things
+def oldSwapLabelMunge(device):
+    label = None
+    try:
+        fd = os.open(device, os.O_RDWR)
+    except:
+        return label
+
+    pagesize = getpagesize()
+    try:
+        buf = os.read(fd, pagesize)
+    except OSError, e:
+        log("error reading swap label on %s: %s" %(device, e))
+        try:
+            os.close(fd)
+        except:
+            pass
+        return label
+
+    if ((len(buf) == pagesize) and (buf[pagesize - 10:] == "SWAPSPACE2")):
+        label = string.rstrip(buf[16:31], "\0x00")
+    os.lseek(fd, 1052, 0)
+    if len(label) > 0:
+        os.write(fd, label)
+    os.close(fd)
+    return label
+
 def readSwapLabel(device, makeDevNode = 1):
     if makeDevNode:
         makeDevInode(device, "/tmp/disk")
-        label = readSwapLabel_int(device)
+        try:
+            oldSwapLabelMunge("/tmp/disk")
+        except Exception, e:
+            log("error munging swap label: %s" %(e,))
+        label = readSwapLabel_int("/tmp/disk")
         os.unlink("/tmp/disk")
     else:
+        try:
+            oldSwapLabelMunge(device)
+        except Exception, e:
+            log("error munging swap label: %s" %(e,))
         label = readSwapLabel_int(device)
     return label