/[smeserver]/rpms/anaconda/sme9/0007-VolGroup.patch
ViewVC logotype

Diff of /rpms/anaconda/sme9/0007-VolGroup.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by wellsi, Mon Dec 16 03:38:13 2013 UTC Revision 1.2 by charliebrady, Fri Jan 3 22:12:21 2014 UTC
# Line 1  Line 1 
1  Index: updates/storage/__init__.py  --- anaconda-13.21.215/storage/__init__.py.orig 2014-01-02 10:18:52.782882172 -0500
2  ===================================================================  +++ anaconda-13.21.215/storage/__init__.py      2014-01-02 10:18:52.798882096 -0500
3  RCS file: /cvsroot/smeserver/cdrom.image/sme9/updates/storage/__init__.py,v  @@ -919,7 +919,7 @@
 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 @@  
4           vgnames = [vg.name for vg in self.vgs]           vgnames = [vg.name for vg in self.vgs]
5           if hn is not None and hn != '':           if hn is not None and hn != '':
6               if hn == 'localhost' or hn == 'localhost.localdomain':               if hn == 'localhost' or hn == 'localhost.localdomain':
# Line 15  diff -u -r1.3 -r1.4 Line 9  diff -u -r1.3 -r1.4
9               elif hn.find('.') != -1:               elif hn.find('.') != -1:
10                   template = "vg_%s" % (hn.split('.')[0].lower(),)                   template = "vg_%s" % (hn.split('.')[0].lower(),)
11                   vgtemplate = safeLvmName(template)                   vgtemplate = safeLvmName(template)
12  @@ -926,7 +926,7 @@  @@ -927,7 +927,7 @@
13                   template = "vg_%s" % (hn.lower(),)                   template = "vg_%s" % (hn.lower(),)
14                   vgtemplate = safeLvmName(template)                   vgtemplate = safeLvmName(template)
15           else:           else:
# Line 24  diff -u -r1.3 -r1.4 Line 18  diff -u -r1.3 -r1.4
18    
19           if vgtemplate not in vgnames and \           if vgtemplate not in vgnames and \
20                   vgtemplate not in lvm.lvm_vg_blacklist:                   vgtemplate not in lvm.lvm_vg_blacklist:
21  @@ -951,12 +951,12 @@  @@ -952,12 +952,12 @@
22           if mountpoint:           if mountpoint:
23               # try to incorporate the mountpoint into the name               # try to incorporate the mountpoint into the name
24               if mountpoint == '/':               if mountpoint == '/':
# Line 40  diff -u -r1.3 -r1.4 Line 34  diff -u -r1.3 -r1.4
34    
35                   lvtemplate = safeLvmName(template)                   lvtemplate = safeLvmName(template)
36           else:           else:
37  @@ -964,13 +964,13 @@  @@ -965,13 +965,13 @@
38                   if len([s for s in self.swaps if s in vg.lvs]):                   if len([s for s in self.swaps if s in vg.lvs]):
39                       idx = 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])
40                       while True:                       while True:

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed