[PATCH] Don't add leading directory for files twice. (#503830)

[David Lehman <dlehman redhat com>]

---
 storage/devices.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/storage/devices.py b/storage/devices.py
index b5e32af..64ceec3 100644
--- a/storage/devices.py
+++ b/storage/devices.py
@@ -2784,7 +2784,7 @@ class FileDevice(StorageDevice):
 
     @property
     def fstabSpec(self):
-        return self.path
+        return self.name
 
     @property
     def path(self):
@@ -2798,6 +2798,9 @@ class FileDevice(StorageDevice):
         if status: 
             # this is the actual active mountpoint
             root = self.parents[0].format._mountpoint
+            # trim the mountpoint down to the chroot since we already have
+            # the otherwise fully-qualified path
+            root = root[:-len(self.parents[0].format.mountpoint)]
 
         return os.path.normpath("%s/%s" % (root, path))
 
-- 
1.6.0.6