[PATCH 18/21] Base auto-generated name prefixes on productName, not device type.

David Lehman dlehman at redhat.com
Thu Aug 9 19:28:37 UTC 2012


---
 pyanaconda/storage/__init__.py |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py
index 881dc0c..31d96c4 100644
--- a/pyanaconda/storage/__init__.py
+++ b/pyanaconda/storage/__init__.py
@@ -1140,7 +1140,7 @@ class Storage(object):
                         hostname = nd.hostname
                         break
 
-            name = self.suggestContainerName(hostname=hostname, prefix="vg")
+            name = self.suggestContainerName(hostname=hostname)
 
         if name in self.names:
             raise ValueError("name already in use")
@@ -1163,8 +1163,7 @@ class Storage(object):
                 swap = True
             else:
                 swap = False
-            name = self.suggestDeviceName(prefix="lv",
-                                          parent=vg,
+            name = self.suggestDeviceName(parent=vg,
                                           swap=swap,
                                           mountpoint=mountpoint)
 
@@ -1212,8 +1211,7 @@ class Storage(object):
                             hostname = nd.hostname
                             break
 
-                name = self.suggestContainerName(prefix="btrfs",
-                                                 hostname=hostname)
+                name = self.suggestContainerName(hostname=hostname)
             if "label" not in fmt_args:
                 fmt_args["label"] = name
 
@@ -1323,6 +1321,9 @@ class Storage(object):
 
     def suggestContainerName(self, hostname=None, prefix=""):
         """ Return a reasonable, unused device name. """
+        if not prefix:
+            prefix = productName.lower().replace(" ", "_")
+
         # try to create a device name incorporating the hostname
         if hostname not in (None, "", 'localhost', 'localhost.localdomain'):
             template = "%s_%s" % (prefix, hostname.split('.')[0].lower())
-- 
1.7.7.6



More information about the anaconda-patches mailing list