diff options
author | Peter Jones <pjones@redhat.com> | 2006-02-03 21:44:23 +0000 |
---|---|---|
committer | Peter Jones <pjones@redhat.com> | 2006-02-03 21:44:23 +0000 |
commit | d2ea525f610b632632085c60a745500893e2dc70 (patch) | |
tree | 67d6b1a8264c4c8fa10a71641361cd8ea9ccec71 | |
parent | e6694b222de8356b3b0aaa9a41a96d00322f9520 (diff) | |
download | anaconda-d2ea525f610b632632085c60a745500893e2dc70.tar.gz anaconda-d2ea525f610b632632085c60a745500893e2dc70.tar.xz anaconda-d2ea525f610b632632085c60a745500893e2dc70.zip |
- fix swap labeling
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | fsset.py | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -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 @@ -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", |