- don't put "mapper/" in the swap label

2 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index c314839ae..b3124bb91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-03  Peter Jones  <pjones@redhat.com>
+
+	* fsset.py (swapFileSystem.labelDevice): don't put "mapper/" in the
+	swap label
+
 2006-02-03  Jeremy Katz  <katzj@redhat.com>
 
 	* anaconda (dispatch): Patch to update steps skipped for rootpath 
diff --git a/fsset.py b/fsset.py
index aff24a8ad..91b2c8236 100644
--- a/fsset.py
+++ b/fsset.py
@@ -778,8 +778,11 @@ class swapFileSystem(FileSystemType):
         # nodes (#176074)
         if devName[0:6] == "cciss/":
             swapLabel = "SW-%s" % (devName)
+        elif devName.startswith("mapper/"):
+            swapLabel = "SWAP-%s" % (devName[7:],)
         else:
             swapLabel = "SWAP-%s" % (devName)
+        swapLabel = swapLabel[0:
         label = labelFactory.createLabel("%s" %swapLabel, self.maxLabelChars)
         rc = iutil.execWithRedirect ("/usr/sbin/mkswap",
                                      [ "mkswap", '-v1', "-L", label, file ],