summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lehman <dlehman@redhat.com>2012-10-11 18:16:23 -0500
committerDavid Lehman <dlehman@redhat.com>2012-10-15 11:48:22 -0500
commitb412c255d1843bb05b45c0ba04a64ca136788176 (patch)
tree655c044663cc0a56eae65e9c5c0695786dfebac0
parentad3e66d2769e45b92d71a1ead5adf46eba83fe0b (diff)
downloadanaconda-b412c255d1843bb05b45c0ba04a64ca136788176.tar.gz
anaconda-b412c255d1843bb05b45c0ba04a64ca136788176.tar.xz
anaconda-b412c255d1843bb05b45c0ba04a64ca136788176.zip
Validate lv names.
Resolves: rhbz#747278
-rw-r--r--pyanaconda/storage/__init__.py9
1 files changed, 9 insertions, 0 deletions
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