--- rpms/anaconda/sme9/0007-VolGroup.patch 2013/12/16 03:38:13 1.1 +++ rpms/anaconda/sme9/0007-VolGroup.patch 2014/01/03 22:12:21 1.2 @@ -1,12 +1,6 @@ -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 @@ +--- 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 @@ vgnames = [vg.name for vg in self.vgs] if hn is not None and hn != '': if hn == 'localhost' or hn == 'localhost.localdomain': @@ -15,7 +9,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 @@ +@@ -927,7 +927,7 @@ template = "vg_%s" % (hn.lower(),) vgtemplate = safeLvmName(template) else: @@ -24,7 +18,7 @@ diff -u -r1.3 -r1.4 if vgtemplate not in vgnames and \ vgtemplate not in lvm.lvm_vg_blacklist: -@@ -951,12 +951,12 @@ +@@ -952,12 +952,12 @@ if mountpoint: # try to incorporate the mountpoint into the name if mountpoint == '/': @@ -40,7 +34,7 @@ diff -u -r1.3 -r1.4 lvtemplate = safeLvmName(template) else: -@@ -964,13 +964,13 @@ +@@ -965,13 +965,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: