diff options
| author | David Lehman <dlehman@redhat.com> | 2009-06-03 12:28:55 -0500 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2009-06-22 17:14:59 -0500 |
| commit | ed40289bd10d5be010a3311edb45c89c93eac6fb (patch) | |
| tree | 4967b7cebad5a46fcdf67dbd09775560089fd1f1 | |
| parent | d170c67b33313b9abd4d5906407909ed98b0a4ee (diff) | |
| download | anaconda-ed40289bd10d5be010a3311edb45c89c93eac6fb.tar.gz anaconda-ed40289bd10d5be010a3311edb45c89c93eac6fb.tar.xz anaconda-ed40289bd10d5be010a3311edb45c89c93eac6fb.zip | |
Don't add leading directory for files twice. (#503830)
| -rw-r--r-- | storage/devices.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/devices.py b/storage/devices.py index 7d2108489..59ec7c154 100644 --- a/storage/devices.py +++ b/storage/devices.py @@ -2815,7 +2815,7 @@ class FileDevice(StorageDevice): @property def fstabSpec(self): - return self.path + return self.name @property def path(self): @@ -2829,6 +2829,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)) |