--- rpms/anaconda/sme9/0007-VolGroup.patch	2014/01/03 22:12:21	1.2
+++ rpms/anaconda/sme9/0007-VolGroup.patch	2015/09/30 09:42:35	1.3
@@ -1,6 +1,7 @@
---- anaconda-13.21.215/storage/__init__.py.orig	2014-01-02 10:18:52.782882172 -0500
-+++ anaconda-13.21.215/storage/__init__.py	2014-01-02 10:18:52.798882096 -0500
-@@ -919,7 +919,7 @@
+diff -Nur anaconda-13.21.239/storage/__init__.py anaconda-13.21.239_bz9080/storage/__init__.py
+--- anaconda-13.21.239/storage/__init__.py	2015-09-30 11:38:16.573437546 +0200
++++ anaconda-13.21.239_bz9080/storage/__init__.py	2015-09-30 11:40:58.476522195 +0200
+@@ -968,7 +968,7 @@
          vgnames = [vg.name for vg in self.vgs]
          if hn is not None and hn != '':
              if hn == 'localhost' or hn == 'localhost.localdomain':
@@ -9,7 +10,7 @@
              elif hn.find('.') != -1:
                  template = "vg_%s" % (hn.split('.')[0].lower(),)
                  vgtemplate = safeLvmName(template)
-@@ -927,7 +927,7 @@
+@@ -976,7 +976,7 @@
                  template = "vg_%s" % (hn.lower(),)
                  vgtemplate = safeLvmName(template)
          else:
@@ -18,7 +19,7 @@
  
          if vgtemplate not in vgnames and \
                  vgtemplate not in lvm.lvm_vg_blacklist:
-@@ -952,12 +952,12 @@
+@@ -1001,12 +1001,12 @@
          if mountpoint:
              # try to incorporate the mountpoint into the name
              if mountpoint == '/':
@@ -34,7 +35,7 @@
  
                  lvtemplate = safeLvmName(template)
          else:
-@@ -965,13 +965,13 @@
+@@ -1014,13 +1014,13 @@
                  if len([s for s in self.swaps if s in vg.lvs]):
                      idx = len([s for s in self.swaps if s in vg.lvs])
                      while True:
@@ -47,6 +48,6 @@
                  else:
 -                    lvtemplate = "lv_swap"
 +                    lvtemplate = "swap"
-             else:
-                 idx = len(vg.lvs)
-                 while True:
+             elif pool:
+                 pool_count = len([p for p in self.thinpools if p in vg.lvs])
+                 if pool_count: