/[smeserver]/rpms/anaconda/sme10/anaconda-koozali-product.patch
ViewVC logotype

Annotation of /rpms/anaconda/sme10/anaconda-koozali-product.patch

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


Revision 1.1 - (hide annotations) (download)
Wed Jun 10 03:55:48 2020 UTC (4 years ago) by jpp
Branch: MAIN
* Mon Dec  7 2015 Karanbir Singh <kbsingh@centos.org> - 21.48.22.56-5.el7.centos
- Forward port existing patch
- discard efivar patch, rolled into install class
- setup new help text
- rebase install class
- ensure productName is available in the yumpayload
- use our own stubs for help
- remove the hard dep for anaconda-user-help ( since its far too upstream specific )
- Skip repo md retry if we are not online ( try at most 2 times (

1 jpp 1.1 --- anaconda-21.48.22.56/pyanaconda/bootloader.py 2020-06-10 05:26:53.428255834 +0200
2     +++ anaconda-21.48.22.56/pyanaconda/bootloader.py 2016-07-29 05:42:58.271517665 +0200
3     @@ -1411,7 +1411,7 @@
4    
5     @property
6     def stage2_format_types(self):
7     - if productName.startswith("Red Hat ") or productName.startswith("CentOS"):
8     + if productName.startswith("Red Hat ") or productName.startswith("CentOS") or productName.startswith("Koozali"):
9     return ["xfs", "ext4", "ext3", "ext2", "btrfs"]
10     else:
11     return ["ext4", "ext3", "ext2", "btrfs", "xfs"]
12     @@ -2105,7 +2105,7 @@
13    
14     @property
15     def stage2_format_types(self):
16     - if productName.startswith("Red Hat ") or productName.startswith("CentOS"):
17     + if productName.startswith("Red Hat ") or productName.startswith("CentOS") or productName.startswith("Koozali"):
18     return ["xfs", "ext4", "ext3", "ext2"]
19     else:
20     return ["ext4", "ext3", "ext2", "xfs"]
21     --- anaconda-21.48.22.56/pyanaconda/installclasses/centos.py 2020-06-10 05:26:53.097268868 +0200
22     +++ anaconda-21.48.22.56/pyanaconda/installclasses/centos.py 2020-05-22 10:29:05.295267142 +0200
23     @@ -28,9 +28,9 @@
24     from blivet.size import Size
25    
26     class RHELBaseInstallClass(BaseInstallClass):
27     - name = "CentOS Linux"
28     + name = "Koozali SME Server 10 alpha5"
29     sortPriority = 20001
30     - if not productName.startswith("CentOS"):
31     + if not productName.startswith("Koozali"):
32     hidden = True
33     defaultFS = "xfs"
34    
35     @@ -69,9 +69,9 @@
36     BaseInstallClass.__init__(self)
37    
38     class RHELAtomicInstallClass(RHELBaseInstallClass):
39     - name = "CentOS Atomic Host"
40     + name = "SME Atomic Host"
41     sortPriority=21001
42     - hidden = not productName.startswith(("CentOS Atomic Host", "CentOS Linux Atomic"))
43     + hidden = not productName.startswith(("SME Atomic Host", "SME Linux Atomic"))
44    
45     def setDefaultPartitioning(self, storage):
46     autorequests = [PartSpec(mountpoint="/", fstype=storage.defaultFSType,
47     --- anaconda-21.48.22.56/pyanaconda/installclasses/fedora.py 2020-06-10 05:26:52.987273207 +0200
48     +++ anaconda-21.48.22.56/pyanaconda/installclasses/fedora.py 2016-07-29 05:42:59.278517374 +0200
49     @@ -25,7 +25,7 @@
50     class FedoraBaseInstallClass(BaseInstallClass):
51     name = "Fedora"
52     sortPriority = 10000
53     - if productName.startswith("Red Hat ") or productName.startswith("CentOS"):
54     + if productName.startswith("Red Hat ") or productName.startswith("CentOS") or productName.startswith("Koozali"):
55     hidden = True
56    
57     _l10n_domain = "anaconda"
58     --- anaconda-21.48.22.56/pyanaconda/installclasses/koozali.py 1970-01-01 01:00:00.000000000 +0100
59     +++ anaconda-21.48.22.56/pyanaconda/installclasses/koozali.py 2020-05-22 10:28:15.271213629 +0200
60     @@ -0,0 +1,97 @@
61     +#
62     +# rhel.py
63     +#
64     +# Copyright (C) 2010 Red Hat, Inc. All rights reserved.
65     +#
66     +# This program is free software; you can redistribute it and/or modify
67     +# it under the terms of the GNU General Public License as published by
68     +# the Free Software Foundation; either version 2 of the License, or
69     +# (at your option) any later version.
70     +#
71     +# This program is distributed in the hope that it will be useful,
72     +# but WITHOUT ANY WARRANTY; without even the implied warranty of
73     +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
74     +# GNU General Public License for more details.
75     +#
76     +# You should have received a copy of the GNU General Public License
77     +# along with this program. If not, see <http://www.gnu.org/licenses/>.
78     +#
79     +
80     +from pyanaconda.installclass import BaseInstallClass
81     +from pyanaconda.product import productName
82     +from pyanaconda import network
83     +from pyanaconda import nm
84     +from pyanaconda.kickstart import getAvailableDiskSpace
85     +from blivet.partspec import PartSpec
86     +from blivet.platform import platform
87     +from blivet.devicelibs import swap
88     +from blivet.size import Size
89     +
90     +class RHELBaseInstallClass(BaseInstallClass):
91     + name = "Koozali SME Server 10 alpha5"
92     + sortPriority = 20003
93     + if not productName.startswith("Koozali"):
94     + hidden = True
95     + defaultFS = "xfs"
96     +
97     + bootloaderTimeoutDefault = 5
98     +
99     + ignoredPackages = ["ntfsprogs", "reiserfs-utils", "hfsplus-tools"]
100     +
101     + installUpdates = False
102     +
103     + _l10n_domain = "comps"
104     +
105     + efi_dir = "centos"
106     +
107     + help_placeholder = "CentOSPlaceholder.html"
108     + help_placeholder_with_links = "CentOSPlaceholder.html"
109     +
110     + def configure(self, anaconda):
111     + BaseInstallClass.configure(self, anaconda)
112     + self.setDefaultPartitioning(anaconda.storage)
113     +
114     + def setNetworkOnbootDefault(self, ksdata):
115     + if network.has_some_wired_autoconnect_device():
116     + return
117     + # choose the device used during installation
118     + # (ie for majority of cases the one having the default route)
119     + dev = network.default_route_device() \
120     + or network.default_route_device(family="inet6")
121     + if not dev:
122     + return
123     + # ignore wireless (its ifcfgs would need to be handled differently)
124     + if nm.nm_device_type_is_wifi(dev):
125     + return
126     + network.update_onboot_value(dev, "yes", ksdata)
127     +
128     + def __init__(self):
129     + BaseInstallClass.__init__(self)
130     +
131     +class RHELAtomicInstallClass(RHELBaseInstallClass):
132     + name = "SME Atomic Host"
133     + sortPriority=21003
134     + hidden = not productName.startswith(("SME Atomic Host", "SME Linux Atomic"))
135     +
136     + def setDefaultPartitioning(self, storage):
137     + autorequests = [PartSpec(mountpoint="/", fstype=storage.defaultFSType,
138     + size=Size("1GiB"), maxSize=Size("3GiB"), grow=True, lv=True)]
139     +
140     + bootreqs = platform.setDefaultPartitioning()
141     + if bootreqs:
142     + autorequests.extend(bootreqs)
143     +
144     + disk_space = getAvailableDiskSpace(storage)
145     + swp = swap.swapSuggestion(disk_space=disk_space)
146     + autorequests.append(PartSpec(fstype="swap", size=swp, grow=False,
147     + lv=True, encrypted=True))
148     +
149     + for autoreq in autorequests:
150     + if autoreq.fstype is None:
151     + if autoreq.mountpoint == "/boot":
152     + autoreq.fstype = storage.defaultBootFSType
153     + autoreq.size = Size("300MiB")
154     + else:
155     + autoreq.fstype = storage.defaultFSType
156     +
157     + storage.autoPartitionRequests = autorequests
158     --- anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py 2020-06-10 05:26:53.788241656 +0200
159     +++ anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py 2016-07-29 05:42:59.946517173 +0200
160     @@ -483,7 +483,7 @@
161     def mirrorEnabled(self):
162     with _yum_lock:
163     # we just skip this on CentOS since we cant support it yet
164     - if productName.startswith("CentOS"):
165     + if productName.startswith("CentOS") or productName.startswith("Koozali"):
166     return False
167     else:
168     # yum initializes with plugins disabled, and when plugins are disabled

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