From b412c255d1843bb05b45c0ba04a64ca136788176 Mon Sep 17 00:00:00 2001
From: David Lehman <dlehman@redhat.com>
Date: Thu, 11 Oct 2012 18:16:23 -0500
Subject: Validate lv names.

Resolves: rhbz#747278
---
 pyanaconda/storage/__init__.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py
index f02230f00..23f7e41eb 100644
--- a/pyanaconda/storage/__init__.py
+++ b/pyanaconda/storage/__init__.py
@@ -1130,6 +1130,15 @@ class Storage(object):
 
         if kwargs.has_key("name"):
             name = kwargs.pop("name")
+            # make sure the specified name is sensible
+            safe_vg_name = self.safeDeviceName(vg.name)
+            full_name = "%s-%s" % (safe_vg_name, name)
+            safe_name = self.safeDeviceName(full_name)
+            if safe_name != full_name:
+                new_name = safe_name[len(safe_vg_name)+1:]
+                log.warning("using '%s' instead of specified name '%s'"
+                                % (new_name, name))
+                name = new_name
         else:
             if kwargs.get("format") and kwargs["format"].type == "swap":
                 swap = True
-- 
cgit