[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH][f15, master] Handle quotes around labels and UUIDs in /etc/fstab. (#670496)



---
 pyanaconda/storage/devicetree.py |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/pyanaconda/storage/devicetree.py b/pyanaconda/storage/devicetree.py
index 05bc3b7..6fac6f5 100644
--- a/pyanaconda/storage/devicetree.py
+++ b/pyanaconda/storage/devicetree.py
@@ -2013,12 +2013,18 @@ class DeviceTree(object):
         if devspec.startswith("UUID="):
             # device-by-uuid
             uuid = devspec.partition("=")[2]
+            if ((uuid.startswith('"') and uuid.endswith('"')) or
+                (uuid.startswith("'") and uuid.endswith("'"))):
+                uuid = uuid[1:-1]
             device = self.uuids.get(uuid)
             if device is None:
                 log.error("failed to resolve device %s" % devspec)
         elif devspec.startswith("LABEL="):
             # device-by-label
             label = devspec.partition("=")[2]
+            if ((label.startswith('"') and label.endswith('"')) or
+                (label.startswith("'") and label.endswith("'"))):
+                label = label[1:-1]
             device = self.labels.get(label)
             if device is None:
                 log.error("failed to resolve device %s" % devspec)
-- 
1.7.3.5


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]