--- rpms/anaconda/sme9/0007-VolGroup.patch	2013/12/16 03:38:13	1.1
+++ rpms/anaconda/sme9/0007-VolGroup.patch	2015/09/30 09:42:35	1.3
@@ -1,12 +1,7 @@
-Index: updates/storage/__init__.py
-===================================================================
-RCS file: /cvsroot/smeserver/cdrom.image/sme9/updates/storage/__init__.py,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- updates/storage/__init__.py	6 Nov 2013 02:06:23 -0000	1.3
-+++ updates/storage/__init__.py	3 Dec 2013 04:09:59 -0000	1.4
-@@ -918,7 +918,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':
@@ -15,7 +10,7 @@ diff -u -r1.3 -r1.4
              elif hn.find('.') != -1:
                  template = "vg_%s" % (hn.split('.')[0].lower(),)
                  vgtemplate = safeLvmName(template)
-@@ -926,7 +926,7 @@
+@@ -976,7 +976,7 @@
                  template = "vg_%s" % (hn.lower(),)
                  vgtemplate = safeLvmName(template)
          else:
@@ -24,7 +19,7 @@ diff -u -r1.3 -r1.4
  
          if vgtemplate not in vgnames and \
                  vgtemplate not in lvm.lvm_vg_blacklist:
-@@ -951,12 +951,12 @@
+@@ -1001,12 +1001,12 @@
          if mountpoint:
              # try to incorporate the mountpoint into the name
              if mountpoint == '/':
@@ -40,7 +35,7 @@ diff -u -r1.3 -r1.4
  
                  lvtemplate = safeLvmName(template)
          else:
-@@ -964,13 +964,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:
@@ -53,6 +48,6 @@ diff -u -r1.3 -r1.4
                  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: