initial commit of file from CVS for anaconda on Fri 21 Jul 14:03:58 BST 2023
This commit is contained in:
parent
1921eff4a6
commit
fecd8ed822
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
@ -0,0 +1 @@
|
||||
*.tar.bz2 filter=lfs diff=lfs merge=lfs -text
|
3
.gitignore
vendored
Normal file
3
.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
*.rpm
|
||||
*.log
|
||||
*spec-20*
|
45
100-anaconda-koozali-product.patch
Normal file
45
100-anaconda-koozali-product.patch
Normal file
@ -0,0 +1,45 @@
|
||||
diff -Nur anaconda-21.48.22.158.old/pyanaconda/bootloader.py anaconda-21.48.22.158/pyanaconda/bootloader.py
|
||||
--- anaconda-21.48.22.158.old/pyanaconda/bootloader.py 2020-06-12 05:31:18.544507836 +0200
|
||||
+++ anaconda-21.48.22.158/pyanaconda/bootloader.py 2020-06-12 05:40:14.983795757 +0200
|
||||
@@ -1428,7 +1428,7 @@
|
||||
|
||||
@property
|
||||
def stage2_format_types(self):
|
||||
- if productName.startswith("Red Hat ") or productName.startswith("CentOS"):
|
||||
+ if productName.startswith("Red Hat ") or productName.startswith("CentOS") or productName.startswith("Koozali"):
|
||||
return ["xfs", "ext4", "ext3", "ext2", "btrfs"]
|
||||
else:
|
||||
return ["ext4", "ext3", "ext2", "btrfs", "xfs"]
|
||||
@@ -2148,7 +2148,7 @@
|
||||
|
||||
@property
|
||||
def stage2_format_types(self):
|
||||
- if productName.startswith("Red Hat ") or productName.startswith("CentOS"):
|
||||
+ if productName.startswith("Red Hat ") or productName.startswith("CentOS") or productName.startswith("Koozali"):
|
||||
return ["xfs", "ext4", "ext3", "ext2"]
|
||||
else:
|
||||
return ["ext4", "ext3", "ext2", "xfs"]
|
||||
diff -Nur anaconda-21.48.22.158.old/pyanaconda/installclasses/fedora.py anaconda-21.48.22.158/pyanaconda/installclasses/fedora.py
|
||||
--- anaconda-21.48.22.158.old/pyanaconda/installclasses/fedora.py 2020-06-12 05:31:18.124523726 +0200
|
||||
+++ anaconda-21.48.22.158/pyanaconda/installclasses/fedora.py 2020-06-12 05:40:15.308783208 +0200
|
||||
@@ -28,7 +28,7 @@
|
||||
class FedoraBaseInstallClass(BaseInstallClass):
|
||||
name = "Fedora"
|
||||
sortPriority = 10000
|
||||
- if productName.startswith("Red Hat ") or productName.startswith("CentOS"):
|
||||
+ if productName.startswith("Red Hat ") or productName.startswith("CentOS") or productName.startswith("Koozali"):
|
||||
hidden = True
|
||||
|
||||
_l10n_domain = "anaconda"
|
||||
diff -Nur anaconda-21.48.22.158.old/pyanaconda/packaging/yumpayload.py anaconda-21.48.22.158/pyanaconda/packaging/yumpayload.py
|
||||
--- anaconda-21.48.22.158.old/pyanaconda/packaging/yumpayload.py 2020-06-12 05:31:18.967491507 +0200
|
||||
+++ anaconda-21.48.22.158/pyanaconda/packaging/yumpayload.py 2020-06-12 05:40:15.407779385 +0200
|
||||
@@ -546,7 +546,7 @@
|
||||
def mirrorEnabled(self):
|
||||
with _yum_lock:
|
||||
# we just skip this on CentOS since we cant support it yet
|
||||
- if productName.startswith("CentOS"):
|
||||
+ if productName.startswith("CentOS") or productName.startswith("Koozali"):
|
||||
return False
|
||||
else:
|
||||
# yum initializes with plugins disabled, and when plugins are disabled
|
49
101-anaconda-koozali-add-koozali-install-class.patch
Normal file
49
101-anaconda-koozali-add-koozali-install-class.patch
Normal file
@ -0,0 +1,49 @@
|
||||
diff -Nur --no-dereference anaconda-21.48.22.159.old/pyanaconda/installclasses/koozali.py anaconda-21.48.22.159/pyanaconda/installclasses/koozali.py
|
||||
--- anaconda-21.48.22.159.old/pyanaconda/installclasses/koozali.py 2022-08-17 01:43:18.893000000 -0400
|
||||
+++ anaconda-21.48.22.159/pyanaconda/installclasses/koozali.py 2022-08-17 01:11:42.918000000 -0400
|
||||
@@ -36,9 +36,9 @@
|
||||
|
||||
|
||||
class RHELBaseInstallClass(BaseInstallClass):
|
||||
- name = "CentOS Linux"
|
||||
+ name = "Koozali SME Server 10"
|
||||
sortPriority = 20001
|
||||
- if not productName.startswith("CentOS"):
|
||||
+ if not productName.startswith("Koozali"):
|
||||
hidden = True
|
||||
defaultFS = "xfs"
|
||||
|
||||
@@ -55,6 +55,33 @@
|
||||
help_placeholder = "CentOSPlaceholder.html"
|
||||
help_placeholder_with_links = "CentOSPlaceholderWithLinks.html"
|
||||
|
||||
+ def setDefaultPartitioning(self, storage):
|
||||
+ autorequests = [PartSpec(mountpoint="/", fstype=storage.defaultFSType,
|
||||
+ size=Size("5GiB"),
|
||||
+ grow=True,
|
||||
+ lv=True, thin=False)]
|
||||
+
|
||||
+ bootreqs = platform.setDefaultPartitioning()
|
||||
+ if bootreqs:
|
||||
+ autorequests.extend(bootreqs)
|
||||
+
|
||||
+
|
||||
+ disk_space = getAvailableDiskSpace(storage)
|
||||
+ swp = swap.swapSuggestion(disk_space=disk_space)
|
||||
+ autorequests.append(PartSpec(fstype="swap", size=swp, grow=False,
|
||||
+ lv=True, encrypted=True))
|
||||
+
|
||||
+ for autoreq in autorequests:
|
||||
+ if autoreq.fstype is None:
|
||||
+ if autoreq.mountpoint == "/boot":
|
||||
+ autoreq.fstype = storage.defaultBootFSType
|
||||
+ autoreq.size = Size("500MiB")
|
||||
+ else:
|
||||
+ autoreq.fstype = storage.defaultFSType
|
||||
+
|
||||
+ storage.autoPartitionRequests = autorequests
|
||||
+
|
||||
+
|
||||
def configure(self, anaconda):
|
||||
BaseInstallClass.configure(self, anaconda)
|
||||
|
98
9800-rpmostreepayload-Rework-remote-add-handling.patch
Normal file
98
9800-rpmostreepayload-Rework-remote-add-handling.patch
Normal file
@ -0,0 +1,98 @@
|
||||
diff -uNrp anaconda-21.48.22.121.orig/pyanaconda/packaging/rpmostreepayload.py anaconda-21.48.22.121/pyanaconda/packaging/rpmostreepayload.py
|
||||
--- anaconda-21.48.22.121.orig/pyanaconda/packaging/rpmostreepayload.py 2017-06-21 12:44:34.000000000 +0000
|
||||
+++ anaconda-21.48.22.121/pyanaconda/packaging/rpmostreepayload.py 2017-08-23 02:28:23.121006339 +0000
|
||||
@@ -142,24 +142,25 @@ class RPMOSTreePayload(ArchivePayload):
|
||||
["admin", "--sysroot=" + iutil.getTargetPhysicalRoot(),
|
||||
"init-fs", iutil.getTargetPhysicalRoot()])
|
||||
|
||||
- repo_arg = "--repo=" + iutil.getTargetPhysicalRoot() + '/ostree/repo'
|
||||
+ self._sysroot_path = Gio.File.new_for_path(iutil.getTargetPhysicalRoot())
|
||||
+ sysroot = OSTree.Sysroot.new(self._sysroot_path)
|
||||
+ sysroot.load(cancellable)
|
||||
+ repo = sysroot.get_repo(None)[1]
|
||||
+ # We don't support resuming from interrupted installs
|
||||
+ repo.set_disable_fsync(True)
|
||||
+
|
||||
+ self._remoteOptions = {}
|
||||
|
||||
- # Store this for use in postInstall too, where we need to
|
||||
- # undo/redo this step.
|
||||
- self._base_remote_args = ["remote", "add"]
|
||||
+ # Handle variations in pykickstart
|
||||
if ((hasattr(ostreesetup, 'noGpg') and ostreesetup.noGpg) or
|
||||
(hasattr(ostreesetup, 'nogpg') and ostreesetup.nogpg)):
|
||||
- self._base_remote_args.append("--set=gpg-verify=false")
|
||||
- self._base_remote_args.extend([ostreesetup.remote,
|
||||
- ostreesetup.url])
|
||||
- self._safeExecWithRedirect("ostree", [repo_arg] + self._base_remote_args)
|
||||
+ self._remoteOptions['gpg-verify'] = GLib.Variant('b', False)
|
||||
|
||||
- self._sysroot_path = sysroot_path = Gio.File.new_for_path(iutil.getTargetPhysicalRoot())
|
||||
- sysroot = OSTree.Sysroot.new(sysroot_path)
|
||||
- sysroot.load(cancellable)
|
||||
+ repo.remote_change(None, OSTree.RepoRemoteChange.ADD_IF_NOT_EXISTS,
|
||||
+ ostreesetup.remote, ostreesetup.url,
|
||||
+ GLib.Variant('a{sv}', self._remoteOptions),
|
||||
+ cancellable)
|
||||
|
||||
- repo = sysroot.get_repo(None)[1]
|
||||
- repo.set_disable_fsync(True)
|
||||
progressQ.send_message(_("Starting pull of %(branchName)s from %(source)s") % \
|
||||
{"branchName": ostreesetup.ref, "source": ostreesetup.remote})
|
||||
|
||||
@@ -192,6 +193,14 @@ class RPMOSTreePayload(ArchivePayload):
|
||||
log.info("ostree pull: " + (progress.get_status() or ""))
|
||||
progressQ.send_message(_("Preparing deployment of %s") % (ostreesetup.ref, ))
|
||||
|
||||
+ # Now that we have the data pulled, delete the remote for now.
|
||||
+ # This will allow a remote configuration defined in the tree
|
||||
+ # (if any) to override what's in the kickstart. Otherwise,
|
||||
+ # we'll re-add it in post. Ideally, ostree would support a
|
||||
+ # pull without adding a remote, but that would get quite
|
||||
+ # complex.
|
||||
+ repo.remote_delete(self.data.ostreesetup.remote, None)
|
||||
+
|
||||
self._safeExecWithRedirect("ostree",
|
||||
["admin", "--sysroot=" + iutil.getTargetPhysicalRoot(),
|
||||
"os-init", ostreesetup.osname])
|
||||
@@ -348,20 +357,30 @@ class RPMOSTreePayload(ArchivePayload):
|
||||
from gi.repository import OSTree
|
||||
cancellable = None
|
||||
|
||||
- # Reload this data - we couldn't keep it open across
|
||||
- # the remounts happening.
|
||||
sysroot = OSTree.Sysroot.new(self._sysroot_path)
|
||||
sysroot.load(cancellable)
|
||||
repo = sysroot.get_repo(None)[1]
|
||||
|
||||
- # This is an ugly hack - we didn't have /etc/ostree/remotes.d,
|
||||
- # so the remote went into /ostree/repo/config. But we want it
|
||||
- # in /etc, so delete that remote, then re-add it to
|
||||
- # /etc/ostree/remotes.d, executing ostree inside the sysroot
|
||||
- # so that it understands it's a "system repository" and should
|
||||
- # modify /etc.
|
||||
- repo.remote_delete(self.data.ostreesetup.remote, None)
|
||||
- self._safeExecWithRedirect("ostree", self._base_remote_args, root=iutil.getSysroot())
|
||||
+ # CentOS specific patch (for now) - pull the remote config from usr/etc if it exists.
|
||||
+ # The OSTree handling here was buggy in that it wasn't looking in the sysroot
|
||||
+ # for existing remotes.
|
||||
+ default_remote_path = iutil.getSysroot() + '/usr/etc/ostree/remotes.d/' + self.data.ostreesetup.osname + '.conf'
|
||||
+ if os.path.isfile(default_remote_path):
|
||||
+ destpath = iutil.getSysroot() + '/etc/ostree/remotes.d/' + os.path.basename(default_remote_path)
|
||||
+ self._safeExecWithRedirect('cp', ['-r', '-p', default_remote_path, destpath])
|
||||
+ else:
|
||||
+ # Following up on the "remote delete" above, we removed the
|
||||
+ # remote from /ostree/repo/config. But we want it in /etc, so
|
||||
+ # re-add it to /etc/ostree/remotes.d, using the sysroot path.
|
||||
+ #
|
||||
+ # However, we ignore the case where the remote already exists,
|
||||
+ # which occurs when the content itself provides the remote
|
||||
+ # config file.
|
||||
+ repo.remote_change(Gio.File.new_for_path(iutil.getSysroot()),
|
||||
+ OSTree.RepoRemoteChange.ADD_IF_NOT_EXISTS,
|
||||
+ self.data.ostreesetup.remote, self.data.ostreesetup.url,
|
||||
+ GLib.Variant('a{sv}', self._remoteOptions),
|
||||
+ cancellable)
|
||||
|
||||
boot = iutil.getSysroot() + '/boot'
|
||||
|
21
Makefile
Normal file
21
Makefile
Normal file
@ -0,0 +1,21 @@
|
||||
# Makefile for source rpm: anaconda
|
||||
# $Id: Makefile,v 1.1 2016/05/17 15:29:30 unnilennium Exp $
|
||||
NAME := anaconda
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
@ -1,3 +1,11 @@
|
||||
# anaconda
|
||||
|
||||
3rd Party (Maintained by Koozali) git repo for anaconda smeserver
|
||||
|
||||
## Description
|
||||
|
||||
<br />*This description has been generated by an LLM AI system and cannot be relied on to be fully correct.*
|
||||
*Once it has been checked, then this comment will be deleted*
|
||||
<br />
|
||||
|
||||
Anaconda is a free and open-source distribution of the Python and R programming languages for scientific computing (data science, machine learning applications, large-scale data processing, predictive analytics, etc.), that aims to simplify package management and deployment. It includes a collection of over 1,500 open-source packages, including all of the core scientific Python packages, the Jupyter Notebook, a graphical user interface and other tools for quickly developing and testing data science applications.
|
||||
|
BIN
anaconda-21.48.22.159.tar.bz2
(Stored with Git LFS)
Normal file
BIN
anaconda-21.48.22.159.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
113
anaconda-centos-add-centos-install-class.patch
Normal file
113
anaconda-centos-add-centos-install-class.patch
Normal file
@ -0,0 +1,113 @@
|
||||
diff -uNr anaconda-21.48.22.56__orig/pyanaconda/installclasses/fedora.py anaconda-21.48.22.56/pyanaconda/installclasses/fedora.py
|
||||
--- anaconda-21.48.22.56__orig/pyanaconda/installclasses/fedora.py 2015-10-22 17:34:02.000000000 +0100
|
||||
+++ anaconda-21.48.22.56/pyanaconda/installclasses/fedora.py 2015-12-07 16:40:33.122000000 +0000
|
||||
@@ -25,7 +25,7 @@
|
||||
class FedoraBaseInstallClass(BaseInstallClass):
|
||||
name = "Fedora"
|
||||
sortPriority = 10000
|
||||
- if productName.startswith("Red Hat "):
|
||||
+ if productName.startswith("Red Hat ") or productName.startswith("CentOS"):
|
||||
hidden = True
|
||||
|
||||
_l10n_domain = "anaconda"
|
||||
diff -uNr anaconda-21.48.22.56__orig/pyanaconda/installclasses/centos.py anaconda-21.48.22.56/pyanaconda/installclasses/centos.py
|
||||
--- anaconda-21.48.22.56__orig/pyanaconda/installclasses/centos.py 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ anaconda-21.48.22.56/pyanaconda/installclasses/centos.py 2015-12-07 16:52:11.157000000 +0000
|
||||
@@ -0,0 +1,97 @@
|
||||
+#
|
||||
+# rhel.py
|
||||
+#
|
||||
+# Copyright (C) 2010 Red Hat, Inc. All rights reserved.
|
||||
+#
|
||||
+# This program is free software; you can redistribute it and/or modify
|
||||
+# it under the terms of the GNU General Public License as published by
|
||||
+# the Free Software Foundation; either version 2 of the License, or
|
||||
+# (at your option) any later version.
|
||||
+#
|
||||
+# This program is distributed in the hope that it will be useful,
|
||||
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+# GNU General Public License for more details.
|
||||
+#
|
||||
+# You should have received a copy of the GNU General Public License
|
||||
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
+#
|
||||
+
|
||||
+from pyanaconda.installclass import BaseInstallClass
|
||||
+from pyanaconda.product import productName
|
||||
+from pyanaconda import network
|
||||
+from pyanaconda import nm
|
||||
+from pyanaconda.kickstart import getAvailableDiskSpace
|
||||
+from blivet.partspec import PartSpec
|
||||
+from blivet.platform import platform
|
||||
+from blivet.devicelibs import swap
|
||||
+from blivet.size import Size
|
||||
+
|
||||
+class RHELBaseInstallClass(BaseInstallClass):
|
||||
+ name = "CentOS Linux"
|
||||
+ sortPriority = 20001
|
||||
+ if not productName.startswith("CentOS"):
|
||||
+ hidden = True
|
||||
+ defaultFS = "xfs"
|
||||
+
|
||||
+ bootloaderTimeoutDefault = 5
|
||||
+
|
||||
+ ignoredPackages = ["ntfsprogs", "reiserfs-utils", "hfsplus-tools"]
|
||||
+
|
||||
+ installUpdates = False
|
||||
+
|
||||
+ _l10n_domain = "comps"
|
||||
+
|
||||
+ efi_dir = "centos"
|
||||
+
|
||||
+ help_placeholder = "CentOSPlaceholder.html"
|
||||
+ help_placeholder_with_links = "CentOSPlaceholderWithLinks.html"
|
||||
+
|
||||
+ def configure(self, anaconda):
|
||||
+ BaseInstallClass.configure(self, anaconda)
|
||||
+ self.setDefaultPartitioning(anaconda.storage)
|
||||
+
|
||||
+ def setNetworkOnbootDefault(self, ksdata):
|
||||
+ if any(nd.onboot for nd in ksdata.network.network if nd.device):
|
||||
+ return
|
||||
+ # choose the device used during installation
|
||||
+ # (ie for majority of cases the one having the default route)
|
||||
+ dev = network.default_route_device() \
|
||||
+ or network.default_route_device(family="inet6")
|
||||
+ if not dev:
|
||||
+ return
|
||||
+ # ignore wireless (its ifcfgs would need to be handled differently)
|
||||
+ if nm.nm_device_type_is_wifi(dev):
|
||||
+ return
|
||||
+ network.update_onboot_value(dev, "yes", ksdata)
|
||||
+
|
||||
+ def __init__(self):
|
||||
+ BaseInstallClass.__init__(self)
|
||||
+
|
||||
+class RHELAtomicInstallClass(RHELBaseInstallClass):
|
||||
+ name = "CentOS Atomic Host"
|
||||
+ sortPriority=21001
|
||||
+ hidden = not productName.startswith(("CentOS Atomic Host", "CentOS Linux Atomic"))
|
||||
+
|
||||
+ def setDefaultPartitioning(self, storage):
|
||||
+ autorequests = [PartSpec(mountpoint="/", fstype=storage.defaultFSType,
|
||||
+ size=Size("1GiB"), maxSize=Size("3GiB"), grow=True, lv=True)]
|
||||
+
|
||||
+ bootreqs = platform.setDefaultPartitioning()
|
||||
+ if bootreqs:
|
||||
+ autorequests.extend(bootreqs)
|
||||
+
|
||||
+ disk_space = getAvailableDiskSpace(storage)
|
||||
+ swp = swap.swapSuggestion(disk_space=disk_space)
|
||||
+ autorequests.append(PartSpec(fstype="swap", size=swp, grow=False,
|
||||
+ lv=True, encrypted=True))
|
||||
+
|
||||
+ for autoreq in autorequests:
|
||||
+ if autoreq.fstype is None:
|
||||
+ if autoreq.mountpoint == "/boot":
|
||||
+ autoreq.fstype = storage.defaultBootFSType
|
||||
+ autoreq.size = Size("300MiB")
|
||||
+ else:
|
||||
+ autoreq.fstype = storage.defaultFSType
|
||||
+
|
||||
+ storage.autoPartitionRequests = autorequests
|
11
anaconda-centos-armhfp-extloader.patch
Normal file
11
anaconda-centos-armhfp-extloader.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- a/pyanaconda/bootloader.py
|
||||
+++ b/pyanaconda/bootloader.py
|
||||
@@ -2239,7 +2239,7 @@ class EXTLINUX(BootLoader):
|
||||
stage2_device_types = ["partition"]
|
||||
stage2_bootable = True
|
||||
|
||||
- packages = ["syslinux-extlinux"]
|
||||
+ packages = ["extlinux-bootloader"]
|
||||
|
||||
@property
|
||||
def config_file(self):
|
21
anaconda-centos-bootfs-default-to-xfs.patch
Normal file
21
anaconda-centos-bootfs-default-to-xfs.patch
Normal file
@ -0,0 +1,21 @@
|
||||
diff -uNr anaconda-21.48.22.56__orig/pyanaconda/bootloader.py anaconda-21.48.22.56/pyanaconda/bootloader.py
|
||||
--- anaconda-21.48.22.56__orig/pyanaconda/bootloader.py 2015-10-29 14:23:19.000000000 +0000
|
||||
+++ anaconda-21.48.22.56/pyanaconda/bootloader.py 2015-12-07 17:23:41.013000000 +0000
|
||||
@@ -1411,7 +1411,7 @@
|
||||
|
||||
@property
|
||||
def stage2_format_types(self):
|
||||
- if productName.startswith("Red Hat "):
|
||||
+ if productName.startswith("Red Hat ") or productName.startswith("CentOS"):
|
||||
return ["xfs", "ext4", "ext3", "ext2", "btrfs"]
|
||||
else:
|
||||
return ["ext4", "ext3", "ext2", "btrfs", "xfs"]
|
||||
@@ -2105,7 +2105,7 @@
|
||||
|
||||
@property
|
||||
def stage2_format_types(self):
|
||||
- if productName.startswith("Red Hat "):
|
||||
+ if productName.startswith("Red Hat ") or productName.startswith("CentOS"):
|
||||
return ["xfs", "ext4", "ext3", "ext2"]
|
||||
else:
|
||||
return ["ext4", "ext3", "ext2", "xfs"]
|
33
anaconda-centos-disable-mirrors.patch
Normal file
33
anaconda-centos-disable-mirrors.patch
Normal file
@ -0,0 +1,33 @@
|
||||
diff -uNrp anaconda-21.48.22.121.orig/pyanaconda/packaging/yumpayload.py anaconda-21.48.22.121/pyanaconda/packaging/yumpayload.py
|
||||
--- anaconda-21.48.22.121.orig/pyananconda/packaging/yumpayload.py 2017-08-31 16:28:06.672265889 +0000
|
||||
+++ anaconda-21.48.22.121/pyanaconda/packaging/yumpayload.py 2017-08-31 16:28:38.812826778 +0000
|
||||
@@ -42,6 +42,7 @@ import time
|
||||
import hashlib
|
||||
from pyanaconda.packaging import SSLOptions
|
||||
from pyanaconda.iutil import execReadlines, ipmi_abort
|
||||
+from pyanaconda.product import productName
|
||||
from pyanaconda.simpleconfig import simple_replace
|
||||
from functools import wraps
|
||||
from urlgrabber.grabber import URLGrabber, URLGrabError
|
||||
@@ -540,12 +541,16 @@ reposdir=%s
|
||||
@property
|
||||
def mirrorEnabled(self):
|
||||
with _yum_lock:
|
||||
- # yum initializes with plugins disabled, and when plugins are disabled
|
||||
- # _yum.plugins is a DummyYumPlugins object, which has no useful attributes.
|
||||
- if hasattr(self._yum.plugins, "_plugins"):
|
||||
- return "fastestmirror" in self._yum.plugins._plugins
|
||||
+ # we just skip this on CentOS since we cant support it yet
|
||||
+ if productName.startswith("CentOS"):
|
||||
+ return False
|
||||
else:
|
||||
- return False
|
||||
+ # yum initializes with plugins disabled, and when plugins are disabled
|
||||
+ # _yum.plugins is a DummyYumPlugins object, which has no useful attributes.
|
||||
+ if hasattr(self._yum.plugins, "_plugins"):
|
||||
+ return "fastestmirror" in self._yum.plugins._plugins
|
||||
+ else:
|
||||
+ return False
|
||||
|
||||
def getRepo(self, repo_id):
|
||||
"""Return the yum repo object."""
|
18
anaconda-centos-help-text.patch
Normal file
18
anaconda-centos-help-text.patch
Normal file
@ -0,0 +1,18 @@
|
||||
diff -uNr anaconda-21.48.22.56__orig/data/help/en-US/CentOSPlaceholder.html anaconda-21.48.22.56/data/help/en-US/CentOSPlaceholder.html
|
||||
--- anaconda-21.48.22.56__orig/data/help/en-US/CentOSPlaceholder.html 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ anaconda-21.48.22.56/data/help/en-US/CentOSPlaceholder.html 2015-12-07 17:07:05.017000000 +0000
|
||||
@@ -0,0 +1,5 @@
|
||||
+<body>
|
||||
+<h1>The Anaconda built-in help</h1>
|
||||
+<p>...is not yet available for this screen.</p>
|
||||
+<p>You can check out the CentOS Linux resouces online at https://wiki.centos.org/InstallerHelp.</p>
|
||||
+</body>
|
||||
diff -uNr anaconda-21.48.22.56__orig/data/help/en-US/CentOSPlaceholderWithLinks.html anaconda-21.48.22.56/data/help/en-US/CentOSPlaceholderWithLinks.html
|
||||
--- anaconda-21.48.22.56__orig/data/help/en-US/CentOSPlaceholderWithLinks.html 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ anaconda-21.48.22.56/data/help/en-US/CentOSPlaceholderWithLinks.html 2015-12-07 17:09:47.845000000 +0000
|
||||
@@ -0,0 +1,5 @@
|
||||
+<body>
|
||||
+<h1>The Anaconda built-in help</h1>
|
||||
+<p>...is not yet available for this screen.</p>
|
||||
+<p>You can check out the CentOS Linux resouces online at https://wiki.centos.org/InstallerHelp.</p>
|
||||
+</body>
|
43
anaconda-centos-really-add-centos-install-class.patch
Normal file
43
anaconda-centos-really-add-centos-install-class.patch
Normal file
@ -0,0 +1,43 @@
|
||||
diff -aurp a/pyanaconda/installclasses/centos.py b/pyanaconda/installclasses/centos.py
|
||||
--- a/pyanaconda/installclasses/centos.py 2019-05-31 19:04:29.202239897 -0300
|
||||
+++ b/pyanaconda/installclasses/centos.py 2019-05-31 19:01:14.000000000 -0300
|
||||
@@ -36,9 +36,9 @@ __all__ = ["RHELBaseInstallClass", "RHEL
|
||||
|
||||
|
||||
class RHELBaseInstallClass(BaseInstallClass):
|
||||
- name = "Red Hat Enterprise Linux"
|
||||
- sortPriority = 20000
|
||||
- if not productName.startswith("Red Hat "):
|
||||
+ name = "CentOS Linux"
|
||||
+ sortPriority = 20001
|
||||
+ if not productName.startswith("CentOS"):
|
||||
hidden = True
|
||||
defaultFS = "xfs"
|
||||
|
||||
@@ -50,10 +50,10 @@ class RHELBaseInstallClass(BaseInstallCl
|
||||
|
||||
_l10n_domain = "comps"
|
||||
|
||||
- efi_dir = "redhat"
|
||||
+ efi_dir = "centos"
|
||||
|
||||
- help_placeholder = "RHEL7Placeholder.html"
|
||||
- help_placeholder_with_links = "RHEL7PlaceholderWithLinks.html"
|
||||
+ help_placeholder = "CentOSPlaceholder.html"
|
||||
+ help_placeholder_with_links = "CentOSPlaceholderWithLinks.html"
|
||||
|
||||
def configure(self, anaconda):
|
||||
BaseInstallClass.configure(self, anaconda)
|
||||
@@ -76,9 +76,9 @@ class RHELBaseInstallClass(BaseInstallCl
|
||||
BaseInstallClass.__init__(self)
|
||||
|
||||
class RHELAtomicInstallClass(RHELBaseInstallClass):
|
||||
- name = "Red Hat Enterprise Linux Atomic Host"
|
||||
- sortPriority=21000
|
||||
- hidden = not productName.startswith(("RHEL Atomic Host", "Red Hat Enterprise Linux Atomic"))
|
||||
+ name = "CentOS Atomic Host"
|
||||
+ sortPriority=21001
|
||||
+ hidden = not productName.startswith(("CentOS Atomic Host", "CentOS Linux Atomic"))
|
||||
|
||||
def __init__(self):
|
||||
self.localemap = {} # loaded lazily
|
12
anaconda-centos-set-right-eula-location.patch
Normal file
12
anaconda-centos-set-right-eula-location.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -uNr anaconda-19.31.79__orig/pyanaconda/constants.py anaconda-19.31.79/pyanaconda/constants.py
|
||||
--- anaconda-19.31.79__orig/pyanaconda/constants.py 2014-04-29 01:45:59.000000000 +0100
|
||||
+++ anaconda-19.31.79/pyanaconda/constants.py 2014-06-18 23:42:35.944668381 +0100
|
||||
@@ -50,7 +50,7 @@
|
||||
productArch = product.productArch
|
||||
bugzillaUrl = product.bugUrl
|
||||
isFinal = product.isFinal
|
||||
-eulaLocation = "/usr/share/redhat-release/EULA"
|
||||
+eulaLocation = "/usr/share/centos-release/EULA"
|
||||
|
||||
# for use in device names, eg: "fedora", "rhel"
|
||||
shortProductName = productName.lower()
|
14
anaconda-centos-skip-retry-if-not-connected.patch
Normal file
14
anaconda-centos-skip-retry-if-not-connected.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff -uNr anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py
|
||||
--- anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py 2015-12-08 14:36:52.533000000 +0000
|
||||
+++ anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py 2015-12-08 14:38:51.464000000 +0000
|
||||
@@ -648,6 +648,10 @@
|
||||
# so that unattended installations on unreliable networks have
|
||||
# a higher chance of finishing successfully
|
||||
xdelay = xprogressive_delay()
|
||||
+ if not nm_is_connected():
|
||||
+ MAX_METADATA_DOWNLOAD_RETRIES = 1
|
||||
+ else:
|
||||
+ MAX_METADATA_DOWNLOAD_RETRIES = 10
|
||||
for retry_count in xrange(0, MAX_METADATA_DOWNLOAD_RETRIES + 1):
|
||||
if retry_count > 0:
|
||||
# introduce a retry delay
|
4580
anaconda.spec
Normal file
4580
anaconda.spec
Normal file
File diff suppressed because it is too large
Load Diff
1
contriborbase
Normal file
1
contriborbase
Normal file
@ -0,0 +1 @@
|
||||
sme10
|
14
yumpayload-dont-verify-disabled-repos.patch
Normal file
14
yumpayload-dont-verify-disabled-repos.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff -uNrp anaconda-21.48.22.121.orig/pyanaconda/packaging/yumpayload.py anaconda-21.48.22.121/pyanaconda/packaging/yumpayload.py
|
||||
--- anaconda-21.48.22.121.orig/pyanaconda/packaging/yumpayload.py 2017-04-27 08:09:33.000000000 -0500
|
||||
+++ anaconda-21.48.22.121/pyanaconda/packaging/yumpayload.py 2017-09-04 00:21:23.617491857 -0500
|
||||
@@ -206,6 +206,10 @@ class YumPayload(PackagePayload):
|
||||
"""Save repomd.xml files for later test for availability."""
|
||||
self._repoMD_list = []
|
||||
for repoID in self.repos:
|
||||
+ if not self.isRepoEnabled(repoID):
|
||||
+ log.info("Not checking metadata for disabled repo %s", repoID)
|
||||
+ continue
|
||||
+
|
||||
repo = self.getRepo(repoID)
|
||||
with _yum_lock:
|
||||
repoMD = RepoMDMetaHash(self, repo)
|
Loading…
Reference in New Issue
Block a user