- fix swap labeling

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d0407a100..da35c002c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-03  Peter Jones  <pjones@redhat.com>
+
+	* fsset.py (swapFileSystem): Fix format strings in call to
+	labelDevice.  Add correct swapFileSystem.maxLabelChars .
+
 2006-02-03  Chris Lumens  <clumens@redhat.com>
 
 	* dispatch.py (installSteps):  Fix arguments to writeConfiguration
diff --git a/fsset.py b/fsset.py
index 91b2c8236..282bdca57 100644
--- a/fsset.py
+++ b/fsset.py
@@ -732,6 +732,7 @@ class swapFileSystem(FileSystemType):
         self.maxSizeMB = 8 * 1024 * 1024
         self.linuxnativefs = 1
         self.supported = 1
+        self.maxLabelChars = 15
         
 
     def mount(self, device, mountpoint, readOnly=0, bindMount=0):
@@ -782,8 +783,7 @@ class swapFileSystem(FileSystemType):
             swapLabel = "SWAP-%s" % (devName[7:],)
         else:
             swapLabel = "SWAP-%s" % (devName)
-        swapLabel = swapLabel[0:
-        label = labelFactory.createLabel("%s" %swapLabel, self.maxLabelChars)
+        label = labelFactory.createLabel(swapLabel, self.maxLabelChars)
         rc = iutil.execWithRedirect ("/usr/sbin/mkswap",
                                      [ "mkswap", '-v1', "-L", label, file ],
                                      stdout = "/dev/tty5",