/[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.3 by vip-ire, Wed Sep 30 09:42:35 2015 UTC
# Line 1  Line 1 
1  Index: updates/storage/__init__.py  diff -Nur anaconda-13.21.239/storage/__init__.py anaconda-13.21.239_bz9080/storage/__init__.py
2  ===================================================================  --- anaconda-13.21.239/storage/__init__.py      2015-09-30 11:38:16.573437546 +0200
3  RCS file: /cvsroot/smeserver/cdrom.image/sme9/updates/storage/__init__.py,v  +++ anaconda-13.21.239_bz9080/storage/__init__.py       2015-09-30 11:40:58.476522195 +0200
4  retrieving revision 1.3  @@ -968,7 +968,7 @@
 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 @@  
5           vgnames = [vg.name for vg in self.vgs]           vgnames = [vg.name for vg in self.vgs]
6           if hn is not None and hn != '':           if hn is not None and hn != '':
7               if hn == 'localhost' or hn == 'localhost.localdomain':               if hn == 'localhost' or hn == 'localhost.localdomain':
# Line 15  diff -u -r1.3 -r1.4 Line 10  diff -u -r1.3 -r1.4
10               elif hn.find('.') != -1:               elif hn.find('.') != -1:
11                   template = "vg_%s" % (hn.split('.')[0].lower(),)                   template = "vg_%s" % (hn.split('.')[0].lower(),)
12                   vgtemplate = safeLvmName(template)                   vgtemplate = safeLvmName(template)
13  @@ -926,7 +926,7 @@  @@ -976,7 +976,7 @@
14                   template = "vg_%s" % (hn.lower(),)                   template = "vg_%s" % (hn.lower(),)
15                   vgtemplate = safeLvmName(template)                   vgtemplate = safeLvmName(template)
16           else:           else:
# Line 24  diff -u -r1.3 -r1.4 Line 19  diff -u -r1.3 -r1.4
19    
20           if vgtemplate not in vgnames and \           if vgtemplate not in vgnames and \
21                   vgtemplate not in lvm.lvm_vg_blacklist:                   vgtemplate not in lvm.lvm_vg_blacklist:
22  @@ -951,12 +951,12 @@  @@ -1001,12 +1001,12 @@
23           if mountpoint:           if mountpoint:
24               # try to incorporate the mountpoint into the name               # try to incorporate the mountpoint into the name
25               if mountpoint == '/':               if mountpoint == '/':
# Line 40  diff -u -r1.3 -r1.4 Line 35  diff -u -r1.3 -r1.4
35    
36                   lvtemplate = safeLvmName(template)                   lvtemplate = safeLvmName(template)
37           else:           else:
38  @@ -964,13 +964,13 @@  @@ -1014,13 +1014,13 @@
39                   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]):
40                       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])
41                       while True:                       while True:
# Line 53  diff -u -r1.3 -r1.4 Line 48  diff -u -r1.3 -r1.4
48                   else:                   else:
49  -                    lvtemplate = "lv_swap"  -                    lvtemplate = "lv_swap"
50  +                    lvtemplate = "swap"  +                    lvtemplate = "swap"
51               else:               elif pool:
52                   idx = len(vg.lvs)                   pool_count = len([p for p in self.thinpools if p in vg.lvs])
53                   while True:                   if pool_count:

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