2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b469389cf..62f22652c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-11  Chris Lumens  <clumens@redhat.com>
+
+	* fsset.py (FileSystemSet.fstab):  Don't add labels to /etc/fstab
+	lines for reused LVs (#216561).
+
 2007-10-10  Jeremy Katz  <katzj@redhat.com>
 
 	* anaconda.spec: Bump version.
diff --git a/fsset.py b/fsset.py
index e38635d3f..d881557d1 100644
--- a/fsset.py
+++ b/fsset.py
@@ -1119,13 +1119,13 @@ class FileSystemSet:
         for entry in self.entries:
             new.add (entry)
         return new
-    
+
     def fstab (self):
 	format = "%-23s %-23s %-7s %-15s %d %d\n"
         fstab = ""
         for entry in self.entries:
             if entry.mountpoint:
-                if entry.getLabel():
+                if entry.getLabel() and entry.device.doLabel is not None:
                     device = "LABEL=%s" % (entry.getLabel(),)
                 else:
                     device = devify(entry.device.getDevice())