[PATCH 2/2] Pass lv name sans vg name to safeLvmName. (#886150)

David Lehman dlehman at redhat.com
Wed Dec 12 20:29:25 UTC 2012


safeLvmName removes dashes, which is a problem when you pass in
a string of the form "$vgname-$lvname".
---
 storage/__init__.py |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/storage/__init__.py b/storage/__init__.py
index 7c62824..1e32d9d 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -834,14 +834,11 @@ class Storage(object):
         if kwargs.has_key("name"):
             name = kwargs.pop("name")
             # make sure the specified name is sensible
-            safe_vg_name = safeLvmName(vg.name)
-            full_name = "%s-%s" % (safe_vg_name, name)
-            safe_name = safeLvmName(full_name)
-            if safe_name != full_name:
-                new_name = safe_name[len(safe_vg_name)+1:]
+            safe_name = safeLvmName(name)
+            if safe_name != name:
                 log.warning("using '%s' instead of specified name '%s'"
-                                % (new_name, name))
-                name = new_name
+                                % (safe_name, name))
+                name = safe_name
         else:
             if kwargs.get("format") and kwargs["format"].type == "swap":
                 swap = True
-- 
1.7.7.6



More information about the anaconda-patches mailing list