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

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

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


Revision 1.2 - (hide annotations) (download)
Fri Jan 3 22:12:21 2014 UTC (10 years, 9 months ago) by charliebrady
Branch: MAIN
CVS Tags: anaconda-13_21_229-1_el6_sme_3, anaconda-13_21_215-1_el6_sme_7, anaconda-13_21_215-1_el6_sme_9, anaconda-13_21_215-1_el6_sme_10, anaconda-13_21_215-1_el6_sme_11, anaconda-13_21_215-1_el6_sme_12, anaconda-13_21_229-1_el6_sme_2, anaconda-13_21_229-1_el6_sme_1, anaconda-13_21_215-1_el6_sme_8, anaconda-13_21_215-1_el6_sme_6, anaconda-13_21_215-1_el6_sme_5, anaconda-13_21_215-1_el6_sme_4
Changes since 1.1: +6 -12 lines
Adjust SME specific patches to have zero offset to avoid .py.orig files. Fix changelog
entry for [SME: 8038] change.

1 charliebrady 1.2 --- 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     @@ -919,7 +919,7 @@
4 wellsi 1.1 vgnames = [vg.name for vg in self.vgs]
5     if hn is not None and hn != '':
6     if hn == 'localhost' or hn == 'localhost.localdomain':
7     - vgtemplate = "VolGroup"
8     + vgtemplate = "main"
9     elif hn.find('.') != -1:
10     template = "vg_%s" % (hn.split('.')[0].lower(),)
11     vgtemplate = safeLvmName(template)
12 charliebrady 1.2 @@ -927,7 +927,7 @@
13 wellsi 1.1 template = "vg_%s" % (hn.lower(),)
14     vgtemplate = safeLvmName(template)
15     else:
16     - vgtemplate = "VolGroup"
17     + vgtemplate = "main"
18    
19     if vgtemplate not in vgnames and \
20     vgtemplate not in lvm.lvm_vg_blacklist:
21 charliebrady 1.2 @@ -952,12 +952,12 @@
22 wellsi 1.1 if mountpoint:
23     # try to incorporate the mountpoint into the name
24     if mountpoint == '/':
25     - lvtemplate = 'lv_root'
26     + lvtemplate = 'root'
27     else:
28     if mountpoint.startswith("/"):
29     - template = "lv_%s" % mountpoint[1:]
30     + template = "%s" % mountpoint[1:]
31     else:
32     - template = "lv_%s" % (mountpoint,)
33     + template = "%s" % (mountpoint,)
34    
35     lvtemplate = safeLvmName(template)
36     else:
37 charliebrady 1.2 @@ -965,13 +965,13 @@
38 wellsi 1.1 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])
40     while True:
41     - lvtemplate = "lv_swap%02d" % idx
42     + lvtemplate = "swap%02d" % idx
43     if lvtemplate in [lv.lvname for lv in vg.lvs]:
44     idx += 1
45     else:
46     break
47     else:
48     - lvtemplate = "lv_swap"
49     + lvtemplate = "swap"
50     else:
51     idx = len(vg.lvs)
52     while True:

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed