From c965729b50e05380e6d1d243f9fd86d92d03fbbe Mon Sep 17 00:00:00 2001 From: wangzhe Date: Thu, 25 May 2023 19:15:44 +0800 Subject: [PATCH 1/5] switch from rpm tree to source tree, remove 0030~0045 patch Signed-off-by: wangzhe --- ...hod-for-backup-service-configuration.patch | 27 ---- ...ogin-authentication-behavior-after-m.patch | 117 --------------- ...ad-the-driver-list-supported-by-ANCK.patch | 134 ------------------ 0034-migrear-grub2-entry-recovery.patch | 63 -------- 0035-GRUB2-EFI-support.patch | 47 ------ ...equirements-check-to-ensure-migratio.patch | 83 ----------- ...loadOrInstallError-and-its-exit-code.patch | 43 ------ ...formation-for-debug-purpose-when-exc.patch | 42 ------ ...d-grub2-tools-update-into-answerfile.patch | 70 --------- ...ix-colloecting-virtio-nic-info-error.patch | 13 -- ...ython-devel-version-check-and-update.patch | 96 ------------- 0042-Report-inhibitor-message-to-SMC.patch | 37 ----- 0043-Fix-the-memory-unit-error.patch | 42 ------ ...vailable-if-some-pkg-installed-from-.patch | 62 -------- ...-existing-symlink-in-handleyumconfig.patch | 37 ----- 15 files changed, 913 deletions(-) delete mode 100644 0030-fix-subprocess-check_output-method-for-backup-service-configuration.patch delete mode 100644 0032-Keep-PermitRootLogin-authentication-behavior-after-m.patch delete mode 100644 0033-Read-the-driver-list-supported-by-ANCK.patch delete mode 100644 0034-migrear-grub2-entry-recovery.patch delete mode 100644 0035-GRUB2-EFI-support.patch delete mode 100644 0036-Perform-system-requirements-check-to-ensure-migratio.patch delete mode 100644 0037-Add-RPMDownloadOrInstallError-and-its-exit-code.patch delete mode 100644 0038-Provides-more-information-for-debug-purpose-when-exc.patch delete mode 100644 0039-Add-grub2-tools-update-into-answerfile.patch delete mode 100644 0040-Fix-colloecting-virtio-nic-info-error.patch delete mode 100644 0041-Add-python-devel-version-check-and-update.patch delete mode 100644 0042-Report-inhibitor-message-to-SMC.patch delete mode 100644 0043-Fix-the-memory-unit-error.patch delete mode 100644 0044-Setup-3rd-repo-available-if-some-pkg-installed-from-.patch delete mode 100644 0045-Fix-bug-with-existing-symlink-in-handleyumconfig.patch diff --git a/0030-fix-subprocess-check_output-method-for-backup-service-configuration.patch b/0030-fix-subprocess-check_output-method-for-backup-service-configuration.patch deleted file mode 100644 index 4e15031..0000000 --- a/0030-fix-subprocess-check_output-method-for-backup-service-configuration.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 719baceb14cb08659fee61249b0be6b9f96f4b65 Mon Sep 17 00:00:00 2001 -From: wangcichen -Date: Tue, 11 Oct 2022 08:34:37 +0800 -Subject: [PATCH] - 0030-fix-subprocess-check_output-method-for-backup-service-configuration - -Signed-off-by: wangcichen ---- - .../el7toel8/actors/serviceconfigurationsynchronizer/actor.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/serviceconfigurationsynchronizer/actor.py b/repos/system_upgrade/el7toel8/actors/serviceconfigurationsynchronizer/actor.py -index 7856bea..9b45d31 100644 ---- a/repos/system_upgrade/el7toel8/actors/serviceconfigurationsynchronizer/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/serviceconfigurationsynchronizer/actor.py -@@ -19,7 +19,7 @@ class ServiceConfigurationSynchronizer(Actor): - def service_configuration_backup(self): - try: - self.log.info("backing up service configurations after migration.") -- services_config_raw = str(subprocess.check_output("systemctl list-unit-files | egrep 'enabled |disabled ' | awk '{print $1,$2}'")).strip() -+ services_config_raw = str(subprocess.check_output("systemctl list-unit-files | egrep 'enabled |disabled ' | awk '{print $1,$2}'", shell=True)).strip() - services_config = { - line.strip().split()[0]: line.strip().split()[1][:-1] - for line in services_config_raw.split('\n') --- -2.22.0 - diff --git a/0032-Keep-PermitRootLogin-authentication-behavior-after-m.patch b/0032-Keep-PermitRootLogin-authentication-behavior-after-m.patch deleted file mode 100644 index c02f5b1..0000000 --- a/0032-Keep-PermitRootLogin-authentication-behavior-after-m.patch +++ /dev/null @@ -1,117 +0,0 @@ -0032-Keep-PermitRootLogin-authentication-behavior-after-m.patchFrom 64f00d273e2141b58230cce1bb4a68010da4c457 Mon Sep 17 00:00:00 2001 -From: Weisson -Date: Wed, 9 Nov 2022 15:21:29 +0800 -Subject: [PATCH] Keep PermitRootLogin authentication behavior after migration. - -Signed-off-by: Weisson -Signed-off-by: Zhao Mingyue ---- - .../actor.py | 25 +++++++++++++ - .../actor.py | 37 +++++++++++++++++++ - .../serviceconfigurationsynchronizer/actor.py | 3 ++ - .../models/configurationsynchronization.py | 1 + - 4 files changed, 66 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/authenticationconfigurationcollector/actor.py - create mode 100644 repos/system_upgrade/el7toel8/actors/authenticationconfigurationsynchronizer/actor.py - -diff --git a/repos/system_upgrade/el7toel8/actors/authenticationconfigurationcollector/actor.py b/repos/system_upgrade/el7toel8/actors/authenticationconfigurationcollector/actor.py -new file mode 100644 -index 0000000..ddbdeba ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/authenticationconfigurationcollector/actor.py -@@ -0,0 +1,25 @@ -+from leapp.actors import Actor -+from leapp.tags import IPUWorkflowTag, ConfigurationCollectionPhaseTag -+from leapp.models import ConfigurationSynchronization -+ -+import subprocess -+import json -+ -+ -+class AuthenticationConfigurationCollector(Actor): -+ """ -+ Keep authentication configuration the same after migration. This is collection phase. -+ """ -+ -+ name = 'authentication_configuration_collector' -+ consumes = () -+ produces = (ConfigurationSynchronization, ) -+ tags = (IPUWorkflowTag, ConfigurationCollectionPhaseTag, ) -+ -+ def process(self): -+ PermitRootLogin = subprocess.check_output('cat /etc/ssh/sshd_config | grep "^PermitRootLogin" || echo "DefaultValue"', shell=True) -+ PasswordAuthentication = subprocess.check_output('cat /etc/ssh/sshd_config | egrep "^PasswordAuthentication" || echo "DefaultValue"', shell=True) -+ PermitRootLogin = str(PermitRootLogin).strip() -+ PasswordAuthentication = str(PasswordAuthentication).strip() -+ -+ self.produce(ConfigurationSynchronization(sshd_auth_configuration=json.dumps({"PermitRootLogin": PermitRootLogin, "PasswordAuthentication": PasswordAuthentication, }))) -diff --git a/repos/system_upgrade/el7toel8/actors/authenticationconfigurationsynchronizer/actor.py b/repos/system_upgrade/el7toel8/actors/authenticationconfigurationsynchronizer/actor.py -new file mode 100644 -index 0000000..0c10a0b ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/authenticationconfigurationsynchronizer/actor.py -@@ -0,0 +1,37 @@ -+from leapp.actors import Actor -+from leapp.tags import IPUWorkflowTag, ConfigurationSynchronizationPhaseTag -+from leapp.models import ConfigurationSynchronization -+ -+import subprocess -+import json -+ -+ -+class AuthenticationConfigurationSynchronizer(Actor): -+ """ -+ Keep authentication configuration the same after migration. This is synchronization phase. -+ """ -+ -+ name = 'authentication_configuration_synchronizer' -+ consumes = (ConfigurationSynchronization, ) -+ produces = () -+ tags = (IPUWorkflowTag, ConfigurationSynchronizationPhaseTag, ) -+ -+ def process(self): -+ for configuration in self.consume(ConfigurationSynchronization): -+ if configuration.sshd_auth_configuration is None: -+ continue -+ -+ sshd_auth_configuration = json.loads(configuration.sshd_auth_configuration) -+ PermitRootLogin = sshd_auth_configuration["PermitRootLogin"] -+ PasswordAuthentication = sshd_auth_configuration["PasswordAuthentication"] -+ -+ if PermitRootLogin == "DefaultValue": -+ PermitRootLogin = "PermitRootLogin yes" -+ if PasswordAuthentication == "DefaultValue": -+ PasswordAuthentication = "# PasswordAuthentication yes" -+ -+ subprocess.run("sed -i '/PasswordAuthentication/d' /etc/ssh/sshd_config", shell=True) -+ subprocess.run("sed -i '/PermitRootLogin/d' /etc/ssh/sshd_config", shell=True) -+ subprocess.run("sed -i '$a\%s' /etc/ssh/sshd_config" % PasswordAuthentication, shell=True) -+ subprocess.run("sed -i '$a\%s' /etc/ssh/sshd_config" % PermitRootLogin, shell=True) -+ subprocess.run("systemctl restart sshd", shell=True) -diff --git a/repos/system_upgrade/el7toel8/actors/serviceconfigurationsynchronizer/actor.py b/repos/system_upgrade/el7toel8/actors/serviceconfigurationsynchronizer/actor.py -index 9b45d31..5f57b4b 100644 ---- a/repos/system_upgrade/el7toel8/actors/serviceconfigurationsynchronizer/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/serviceconfigurationsynchronizer/actor.py -@@ -90,6 +90,9 @@ class ServiceConfigurationSynchronizer(Actor): - try: - self.log.info("Starting to synchronize services configurations.") - for configuration in self.consume(ConfigurationSynchronization): -+ if configuration.services_configuration is None: -+ continue -+ - services_configuration = json.loads(configuration.services_configuration) - config_report = self.config_services(services_configuration, backup_configuratuon) - -diff --git a/repos/system_upgrade/el7toel8/models/configurationsynchronization.py b/repos/system_upgrade/el7toel8/models/configurationsynchronization.py -index 349ac3d..1133674 100644 ---- a/repos/system_upgrade/el7toel8/models/configurationsynchronization.py -+++ b/repos/system_upgrade/el7toel8/models/configurationsynchronization.py -@@ -4,4 +4,5 @@ from leapp.topics import ConfigurationSynchronizationTopic - class ConfigurationSynchronization(Model): - topic = ConfigurationSynchronizationTopic - services_configuration = fields.Nullable(fields.String()) -+ sshd_auth_configuration = fields.Nullable(fields.String()) - --- -2.30.1 (Apple Git-130) - diff --git a/0033-Read-the-driver-list-supported-by-ANCK.patch b/0033-Read-the-driver-list-supported-by-ANCK.patch deleted file mode 100644 index 0746346..0000000 --- a/0033-Read-the-driver-list-supported-by-ANCK.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 16314396e430511f4afafba0aff83c54e3220689 Mon Sep 17 00:00:00 2001 -From: Bitao Hu -Date: Tue, 15 Nov 2022 15:28:58 +0800 -Subject: [Patch] Read the driver list supported by ANCK to determine driver compatibility problem, when migrating to Anolis8 with ANCK. - -Signed-off-by: Bitao Hu ---- - .../actors/kernel/checkkerneldrivers/actor.py | 16 ++++- - .../files/removed_drivers_anck.txt | 69 +++++++++++++++++++ - ...d_drivers.txt => removed_drivers_rhck.txt} | 0 - 3 files changed, 82 insertions(+), 3 deletions(-) - create mode 100644 repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/removed_drivers_anck.txt - rename repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/{removed_drivers.txt => removed_drivers_rhck.txt} (100%) - -diff --git a/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py -index 19fefc3..6c4b042 100644 ---- a/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py -@@ -4,7 +4,7 @@ from leapp.libraries.actor.checkkerneldrivers import ( - get_present_drivers, - get_removed_drivers, - ) --from leapp.models import PCIDevices -+from leapp.models import (PCIDevices, CustomTargetRepository) - from leapp.reporting import Report, create_report - from leapp import reporting - from leapp.tags import ChecksPhaseTag, IPUWorkflowTag -@@ -23,12 +23,22 @@ class CheckKernelDrivers(Actor): - files/removed_drivers.txt file. - """ - name = 'check_kernel_drivers' -- consumes = (PCIDevices,) -+ consumes = (PCIDevices, CustomTargetRepository) - produces = (Report,) - tags = (ChecksPhaseTag, IPUWorkflowTag) - - def process(self): -- removed_file = 'files/removed_drivers.txt' -+ toANCK = False -+ removed_file = '' -+ for repo in self.consume(CustomTargetRepository): -+ if repo.repoid == 'anolis_plus': -+ toANCK = True -+ break -+ if toANCK == True: -+ removed_file = 'files/removed_drivers_anck.txt' -+ else: -+ removed_file = 'files/removed_drivers_rhck.txt' -+ - conflicting = check_drivers(get_removed_drivers(removed_file), get_present_drivers()) - - if conflicting: -diff --git a/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/removed_drivers_anck.txt b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/removed_drivers_anck.txt -new file mode 100644 -index 0000000..1ab9e3e ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/removed_drivers_anck.txt -@@ -0,0 +1,69 @@ -+# Support for the following device drivers has been removed in Anolis 8. -+ -+at91_ether -+osdblk -+ebt_ulog -+ablk_helper -+pcompress -+salsa20-x86_64 -+zlib -+gve -+hid-lenovo-tpkbd -+hid-ps3remote -+hmcdrv -+iavf -+idma64 -+igc -+ib_ipath -+ipg -+gpio-ir-recv -+ir-lirc-codec -+ir-rc5-sz-decoder -+dell-led -+rtsx_pci -+rtsx_usb -+nft_meta_bridge -+nft_exthdr -+nft_meta -+nft_rbtree -+pata_arasan_cf -+pata_cs5536 -+pch_dma -+pch_gbe -+pch_phub -+ptp_pch -+rtw88 -+rtwpci -+libsrp -+scsi_tgt -+snd-firewire-speakers -+snd-scs1x -+snd-tea575x-tuner -+wacom -+uio_pdrv_genirq -+vringh -+videobuf-dvb -+btcx-risc -+mt9v011 -+output -+stk1160 -+poseidon -+tvp5150 -+w83697hf_wdt -+w83697ug_wdt -+xen-acpi-processor -+dvb-usb-friio -+dvb-usb-it913x -+ipt_ULOG -+xgmac -+sctp_probe -+nf_conntrack_ipv4 -+nf_conntrack_ipv6 -+nfnetlink_cthelper -+libore -+objlayoutdriver -+snd-soc-sst-baytrail-pcm -+stm_p_basic -+stm_p_sys-t -+i7300_idle -+it913x-fe -diff --git a/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/removed_drivers.txt b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/removed_drivers_rhck.txt -similarity index 100% -rename from repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/removed_drivers.txt -rename to repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/files/removed_drivers_rhck.txt --- -2.27.0 - diff --git a/0034-migrear-grub2-entry-recovery.patch b/0034-migrear-grub2-entry-recovery.patch deleted file mode 100644 index 50e1671..0000000 --- a/0034-migrear-grub2-entry-recovery.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 186971e9c4e849d88db23447a22658f516ca2a40 Mon Sep 17 00:00:00 2001 -From: Weisson -Date: Thu, 8 Dec 2022 15:47:19 +0800 -Subject: [PATCH] migrear grub2 entry recovery. - -Signed-off-by: Weisson ---- - .../actors/dnfupgradetransaction/actor.py | 21 +++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/repos/system_upgrade/el7toel8/actors/dnfupgradetransaction/actor.py b/repos/system_upgrade/el7toel8/actors/dnfupgradetransaction/actor.py -index 73e5a83..289fac2 100644 ---- a/repos/system_upgrade/el7toel8/actors/dnfupgradetransaction/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/dnfupgradetransaction/actor.py -@@ -13,6 +13,8 @@ from leapp.models import ( - UsedTargetRepositories, - ) - from leapp.tags import IPUWorkflowTag, RPMUpgradePhaseTag -+import subprocess -+import re - - - class DnfUpgradeTransaction(Actor): -@@ -35,6 +37,8 @@ class DnfUpgradeTransaction(Actor): - produces = (TransactionCompleted,) - tags = (RPMUpgradePhaseTag, IPUWorkflowTag) - -+ grub2_migrear_prefix = 'title=MigReaR-' -+ - def process(self): - src_rhsm_info = next(self.consume(RHSMInfo), None) - if src_rhsm_info: -@@ -47,10 +51,27 @@ class DnfUpgradeTransaction(Actor): - tasks = next(self.consume(FilteredRpmTransactionTasks), FilteredRpmTransactionTasks()) - target_userspace_info = next(self.consume(TargetUserSpaceInfo), None) - -+ output = subprocess.check_output("grubby --info=ALL", shell=True).strip() -+ grub_entries = output.split('index=') -+ -+ migrear_entries = [] -+ for entry in grub_entries: -+ if self.grub2_migrear_prefix in entry: -+ items = re.findall(r"kernel=(.*)\nargs=(.*)\ninitrd=(.*)\ntitle=(.*)\n", entry) -+ if len(items) == 1: -+ migrear_entries += [dict(zip(("kernel", "args", "initrd", "title"), items[0]))] -+ - dnfplugin.perform_transaction_install( - tasks=tasks, used_repos=used_repos, storage_info=storage_info, target_userspace_info=target_userspace_info, - plugin_info=plugin_info - ) -+ -+ for entry in migrear_entries: -+ try: -+ subprocess.check_call("grubby --add-kernel %s --initrd %s --args=%s --title=%s" % (entry['kernel'], entry['initrd'], entry['args'], entry['title']), shell=True) -+ except Exception as e: -+ self.log.info(" ".join(["Failed restore migrear entry", str(entry), "Exception:", str(e)]), exc_info=True) -+ - self.produce(TransactionCompleted()) - userspace = next(self.consume(TargetUserSpaceInfo), None) - if userspace: --- -2.30.1 (Apple Git-130) - diff --git a/0035-GRUB2-EFI-support.patch b/0035-GRUB2-EFI-support.patch deleted file mode 100644 index 5c8789a..0000000 --- a/0035-GRUB2-EFI-support.patch +++ /dev/null @@ -1,47 +0,0 @@ -From cbd47a0e35aaa7b31866f50465629b465f860964 Mon Sep 17 00:00:00 2001 -From: Weisson -Date: Sun, 8 Jan 2023 23:06:51 +0800 -Subject: [PATCH] GRUB2-EFI support. - -Signed-off-by: Weisson ---- - .../actors/dnfupgradetransaction/actor.py | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/dnfupgradetransaction/actor.py b/repos/system_upgrade/el7toel8/actors/dnfupgradetransaction/actor.py -index 289fac2..64bd3a3 100644 ---- a/repos/system_upgrade/el7toel8/actors/dnfupgradetransaction/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/dnfupgradetransaction/actor.py -@@ -57,9 +57,17 @@ class DnfUpgradeTransaction(Actor): - migrear_entries = [] - for entry in grub_entries: - if self.grub2_migrear_prefix in entry: -- items = re.findall(r"kernel=(.*)\nargs=(.*)\ninitrd=(.*)\ntitle=(.*)\n", entry) -- if len(items) == 1: -- migrear_entries += [dict(zip(("kernel", "args", "initrd", "title"), items[0]))] -+ kernel = re.findall(r"kernel=(/.*)\n", entry) -+ nargs = re.findall(r"args=(.*)\n", entry) -+ initrd = re.findall(r"initrd=(.*)\n", entry) -+ title = re.findall(r"title=(.*)\n", entry) -+ if len(kernel) == 1 and len(initrd) == 1 and len(title) == 1: -+ migrear_entries += [{ -+ "kernel": kernel[0], -+ "args": nargs[0] if len(nargs) == 1 else "", -+ "initrd": initrd[0], -+ "title": title[0], -+ }] - - dnfplugin.perform_transaction_install( - tasks=tasks, used_repos=used_repos, storage_info=storage_info, target_userspace_info=target_userspace_info, -@@ -68,7 +76,7 @@ class DnfUpgradeTransaction(Actor): - - for entry in migrear_entries: - try: -- subprocess.check_call("grubby --add-kernel %s --initrd %s --args=%s --title=%s" % (entry['kernel'], entry['initrd'], entry['args'], entry['title']), shell=True) -+ subprocess.check_call("grubby --copy-default --add-kernel %s --initrd %s --args=%s --title=%s" % (entry['kernel'], entry['initrd'], entry['args'], entry['title']), shell=True) - except Exception as e: - self.log.info(" ".join(["Failed restore migrear entry", str(entry), "Exception:", str(e)]), exc_info=True) - --- -2.30.1 (Apple Git-130) - diff --git a/0036-Perform-system-requirements-check-to-ensure-migratio.patch b/0036-Perform-system-requirements-check-to-ensure-migratio.patch deleted file mode 100644 index 96e81ab..0000000 --- a/0036-Perform-system-requirements-check-to-ensure-migratio.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 9dd7ac2917bf6b6f78b745593f1cd0127c2dc3fd Mon Sep 17 00:00:00 2001 -From: Weisson -Date: Thu, 29 Dec 2022 22:31:26 +0800 -Subject: [PATCH] Perform system requirements check to ensure migration. - -Signed-off-by: Weisson ---- - .../actors/systemrequirementschecker/actor.py | 22 +++++++++++++ - .../libraries/systemchecker.py | 33 +++++++++++++++++++ - 2 files changed, 55 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/systemrequirementschecker/actor.py - create mode 100644 repos/system_upgrade/el7toel8/actors/systemrequirementschecker/libraries/systemchecker.py - -diff --git a/repos/system_upgrade/el7toel8/actors/systemrequirementschecker/actor.py b/repos/system_upgrade/el7toel8/actors/systemrequirementschecker/actor.py -new file mode 100644 -index 0000000..59af805 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/systemrequirementschecker/actor.py -@@ -0,0 +1,22 @@ -+from leapp.actors import Actor -+from leapp import tags -+from leapp.libraries.actor import systemchecker -+ -+ -+class SystemRequirementsChecker(Actor): -+ """ -+ No documentation has been provided for the system_requirements_checker actor. -+ """ -+ -+ name = 'system_requirements_checker' -+ consumes = () -+ produces = () -+ tags = (tags.FactsPhaseTag, tags.IPUWorkflowTag, ) -+ -+ def process(self): -+ sc = systemchecker.SystemChecker() -+ vm_info = sc.virtual_memory() -+ partition = sc.partition_size_from_directory("/var/lib/leapp/") -+ -+ assert partition['free'] >= 4 * 1024 * 1024 * 1024 and vm_info['free'] >= 600 * 1024 * 1024, "To ensure the migration, this machine must have 4G free space on disk and 600M RAM available." -+ assert sc.initd_is_symlink(), "It is crucial that /etc/init.d be a symlink to rc.d/init.d by default." -diff --git a/repos/system_upgrade/el7toel8/actors/systemrequirementschecker/libraries/systemchecker.py b/repos/system_upgrade/el7toel8/actors/systemrequirementschecker/libraries/systemchecker.py -new file mode 100644 -index 0000000..f77dde8 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/systemrequirementschecker/libraries/systemchecker.py -@@ -0,0 +1,33 @@ -+import subprocess -+import os -+import sys -+import psutil -+ -+ -+class SystemChecker(object): -+ def partition_size_from_directory(self, directory): -+ statvfs = os.statvfs(directory) -+ return { -+ "free": statvfs.f_frsize * statvfs.f_bfree, -+ "total": statvfs.f_frsize * statvfs.f_blocks, -+ "blocks": statvfs.f_blocks, -+ "freeblocks": statvfs.f_bfree, -+ "blocksize": statvfs.f_frsize, -+ } -+ -+ def virtual_memory(self): -+ mem_info = psutil.virtual_memory() -+ return { -+ "free": mem_info.available, -+ "total": mem_info.total, -+ } -+ -+ def is_symlink(self, directory): -+ return os.path.islink(directory) -+ -+ def initd_is_symlink(self, initd_directory="/etc/init.d"): -+ is_symlink = self.is_symlink(initd_directory) -+ if not is_symlink: -+ return False -+ link_path = os.readlink(initd_directory) -+ return link_path == "rc.d/init.d" or link_path == "/etc/rc.d/init.d" --- -2.30.1 (Apple Git-130) - diff --git a/0037-Add-RPMDownloadOrInstallError-and-its-exit-code.patch b/0037-Add-RPMDownloadOrInstallError-and-its-exit-code.patch deleted file mode 100644 index 7dc4e6e..0000000 --- a/0037-Add-RPMDownloadOrInstallError-and-its-exit-code.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 56293fcde7534e42dccfae39d5db26f47d5b1f79 Mon Sep 17 00:00:00 2001 -From: Weisson -Date: Thu, 16 Feb 2023 15:12:08 +0800 -Subject: [PATCH] Add RPMDownloadOrInstallError and its exit code. - -Signed-off-by: Weisson ---- - .../el7toel8/actors/dnfpackagedownload/actor.py | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/dnfpackagedownload/actor.py b/repos/system_upgrade/el7toel8/actors/dnfpackagedownload/actor.py -index 8e29faa..95c8865 100644 ---- a/repos/system_upgrade/el7toel8/actors/dnfpackagedownload/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/dnfpackagedownload/actor.py -@@ -10,6 +10,10 @@ from leapp.models import ( - XFSPresence, - ) - from leapp.tags import DownloadPhaseTag, IPUWorkflowTag -+from leapp.exceptions import RPMDownloadOrInstallError -+ -+import sys -+import traceback - - - class DnfPackageDownload(Actor): -@@ -43,7 +47,10 @@ class DnfPackageDownload(Actor): - rhui_info = next(self.consume(RHUIInfo), None) - on_aws = bool(rhui_info and rhui_info.provider == 'aws') - -- dnfplugin.perform_rpm_download( -- tasks=tasks, used_repos=used_repos, target_userspace_info=target_userspace_info, -- xfs_info=xfs_info, storage_info=storage_info, plugin_info=plugin_info, on_aws=on_aws -- ) -+ try: -+ dnfplugin.perform_rpm_download( -+ tasks=tasks, used_repos=used_repos, target_userspace_info=target_userspace_info, -+ xfs_info=xfs_info, storage_info=storage_info, plugin_info=plugin_info, on_aws=on_aws -+ ) -+ except Exception as e: -+ raise RPMDownloadOrInstallError(message="fail to download rpm packages.", traceback=''.join(traceback.format_exception(*sys.exc_info()))) --- -2.30.1 (Apple Git-130) - diff --git a/0038-Provides-more-information-for-debug-purpose-when-exc.patch b/0038-Provides-more-information-for-debug-purpose-when-exc.patch deleted file mode 100644 index 49919ae..0000000 --- a/0038-Provides-more-information-for-debug-purpose-when-exc.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5574f75fb144b4d8da6f6c4bfcb1e27d55ba741b Mon Sep 17 00:00:00 2001 -From: Weisson -Date: Mon, 6 Mar 2023 14:04:15 +0800 -Subject: [PATCH] Provides more information for debug purpose when exception - happens in system requirement check. - -Signed-off-by: Weisson ---- - .../actors/systemrequirementschecker/actor.py | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/systemrequirementschecker/actor.py b/repos/system_upgrade/el7toel8/actors/systemrequirementschecker/actor.py -index 2757152..242a6ff 100644 ---- a/repos/system_upgrade/el7toel8/actors/systemrequirementschecker/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/systemrequirementschecker/actor.py -@@ -2,6 +2,10 @@ from leapp.actors import Actor - from leapp import tags - from leapp.libraries.actor import systemchecker - -+from leapp.exceptions import SystemEnvironmentCheckError, FailureInSystemEnvironmentCheckError -+import sys -+import traceback -+ - - class SystemRequirementsChecker(Actor): - """ -@@ -18,5 +22,10 @@ class SystemRequirementsChecker(Actor): - vm_info = sc.virtual_memory() - partition = sc.partition_size_from_directory("/var/lib/leapp/") - -- assert partition['free'] >= 4 * 1024 * 1024 * 1024 and vm_info['free'] >= 600 * 1024 * 1024, "To ensure the migration, this machine must have 4G free space on disk and 600M RAM available." -- assert sc.initd_is_symlink(), "It is crucial that /etc/init.d be a symlink to rc.d/init.d by default." -+ try: -+ assert partition['free'] >= 4 * 1024 * 1024 * 1024 and vm_info['free'] >= 600 * 1024 * 1024, "To ensure the migration, this machine must have 4G free space on disk and 600M RAM available." -+ assert sc.initd_is_symlink(), "It is crucial that /etc/init.d be a symlink to rc.d/init.d by default." -+ except AssertionError as e: -+ raise SystemEnvironmentCheckError(message=e.message, traceback=''.join(traceback.format_exception(*sys.exc_info()))) -+ except Exception as e: -+ raise FailureInSystemEnvironmentCheckError(message="Exception raised in system requirements check.", traceback=''.join(traceback.format_exception(*sys.exc_info()))) --- -2.35.3 - diff --git a/0039-Add-grub2-tools-update-into-answerfile.patch b/0039-Add-grub2-tools-update-into-answerfile.patch deleted file mode 100644 index cc17315..0000000 --- a/0039-Add-grub2-tools-update-into-answerfile.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 8c3492ffd04840415b2db0fdd8320690ff6cce31 Mon Sep 17 00:00:00 2001 -From: Bitao Hu -Date: Thu, 9 Mar 2023 20:13:55 +0800 -Subject: [PATCH] Add grub2-tools update into answerfile. - -Signed-off-by: Bitao Hu ---- - .../el7toel8/actors/checkpkgforupgrade/actor.py | 28 ++++++++++++++++++++-- - 1 file changed, 26 insertions(+), 2 deletions(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py b/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py -index 9e42030..5c7b0a0 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py -@@ -5,6 +5,9 @@ from leapp.reporting import Report, create_report - from leapp import reporting - from leapp.tags import ChecksPhaseTag, IPUWorkflowTag - from leapp.libraries.stdlib import run -+from leapp.dialogs import Dialog -+from leapp.dialogs.components import BooleanComponent -+import subprocess - - - class CheckPackagesForUpgrade(Actor): -@@ -17,6 +20,23 @@ class CheckPackagesForUpgrade(Actor): - produces = (Report,) - tags = (ChecksPhaseTag, IPUWorkflowTag) - -+ dialogs = ( -+ Dialog( -+ scope='update_grub2-tools', -+ reason='Confirmation', -+ components=( -+ BooleanComponent( -+ key='confirm', -+ label='Update grub2-tools? ' -+ 'If no, the upgrade process will be interrupted.', -+ description='grub2 version is too low for system upgrade.', -+ reason='grub2 version must be upgrade to version >= 2.02-0.64, ' -+ 'otherwise system upgrade will get failed after reboot.' -+ ), -+ ) -+ ), -+ ) -+ - def get_releasever_of_rpm(self, pkg_name): - rel_ver = run(['rpm', '-q', pkg_name, '--qf', '%{RELEASE}'], split=False)['stdout'] - return rel_ver -@@ -50,7 +70,11 @@ class CheckPackagesForUpgrade(Actor): - def process(self): - if has_package(InstalledRedHatSignedRPM, 'grub2'): - grub2_version = self.get_releasever_of_rpm('grub2') -- if self.compare_version(grub2_version, '0.64') < 0: -+ answer = self.get_answers(self.dialogs[0]) -+ -+ if self.compare_version(grub2_version, '0.64') < 0 and answer.get('confirm') == True: -+ subprocess.call(['yum', 'update', 'grub2', '-y']) -+ elif self.compare_version(grub2_version, '0.64') < 0: - commands = [['yum', '-y', 'update', 'grub2']] - create_report([ - reporting.Title('grub2 version is too low for system upgrade'), -@@ -62,4 +86,4 @@ class CheckPackagesForUpgrade(Actor): - reporting.Flags([reporting.Flags.INHIBITOR]), - reporting.Remediation(commands=commands), - reporting.RelatedResource('package', 'grub2'), -- ]) -+ ]) --- -1.8.3.1 - diff --git a/0040-Fix-colloecting-virtio-nic-info-error.patch b/0040-Fix-colloecting-virtio-nic-info-error.patch deleted file mode 100644 index 1d57102..0000000 --- a/0040-Fix-colloecting-virtio-nic-info-error.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -aurN leapp-repository-0.13.0/repos/system_upgrade/el7toel8/libraries/persistentnetnames.py leapp-repository-0.13.0-new/repos/system_upgrade/el7toel8/libraries/persistentnetnames.py ---- leapp-repository-0.13.0/repos/system_upgrade/el7toel8/libraries/persistentnetnames.py 2021-02-05 03:24:17.000000000 +0800 -+++ leapp-repository-0.13.0-new/repos/system_upgrade/el7toel8/libraries/persistentnetnames.py 2023-03-25 11:31:49.038000000 +0800 -@@ -20,6 +20,9 @@ - """ - pci = {} - -+ if path.startswith('virtio-pci-'): -+ path = path[7:] -+ - # TODO(msekleta): check that path argument actually has ID_PATH format - if path.startswith('pci-'): - components = path[4:16].split(':') diff --git a/0041-Add-python-devel-version-check-and-update.patch b/0041-Add-python-devel-version-check-and-update.patch deleted file mode 100644 index af04a4f..0000000 --- a/0041-Add-python-devel-version-check-and-update.patch +++ /dev/null @@ -1,96 +0,0 @@ -From c36c419fe2821d5d0e86fb1b29f757c6f7ab4ce4 Mon Sep 17 00:00:00 2001 -From: wangzhe -Date: Wed, 12 Apr 2023 11:55:21 +0800 -Subject: [PATCH] Add python-devel version check and update. - ---- - .../el7toel8/actors/checkpkgforupgrade/actor.py | 68 +++++++++++++++++----- - 1 file changed, 52 insertions(+), 16 deletions(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py b/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py -index 5c7b0a0..d52bdc7 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py -@@ -35,6 +35,20 @@ class CheckPackagesForUpgrade(Actor): - ), - ) - ), -+ Dialog( -+ scope='update_python-devel', -+ reason='Confirmation', -+ components=( -+ BooleanComponent( -+ key='confirm', -+ label='Update python-devel ? ' -+ 'If not, the upgrade process will be interrupted.', -+ description='python-devel version is too low for system upgrade.', -+ reason='python-devel version must be upgrade to version >= 2.7.5-77, ' -+ 'otherwise system upgrade will get failed after reboot.' -+ ), -+ ) -+ ), - ) - - def get_releasever_of_rpm(self, pkg_name): -@@ -70,20 +84,42 @@ class CheckPackagesForUpgrade(Actor): - def process(self): - if has_package(InstalledRedHatSignedRPM, 'grub2'): - grub2_version = self.get_releasever_of_rpm('grub2') -- answer = self.get_answers(self.dialogs[0]) - -- if self.compare_version(grub2_version, '0.64') < 0 and answer.get('confirm') == True: -- subprocess.call(['yum', 'update', 'grub2', '-y']) -- elif self.compare_version(grub2_version, '0.64') < 0: -- commands = [['yum', '-y', 'update', 'grub2']] -- create_report([ -- reporting.Title('grub2 version is too low for system upgrade'), -- reporting.Summary( -- 'grub2 version must be upgrade to version >= 2.02-0.64, ' -- 'otherwise system upgrade will get failed after reboot.' -- ), -- reporting.Severity(reporting.Severity.HIGH), -- reporting.Flags([reporting.Flags.INHIBITOR]), -- reporting.Remediation(commands=commands), -- reporting.RelatedResource('package', 'grub2'), -- ]) -+ if self.compare_version(grub2_version, '0.64') < 0: -+ answer = self.get_answers(self.dialogs[0]) -+ if answer.get('confirm') == True: -+ subprocess.call(['yum', 'update', '-y', 'grub2']) -+ else: -+ commands = [['yum', '-y', 'update', 'grub2']] -+ create_report([ -+ reporting.Title('grub2 version is too low for system upgrade'), -+ reporting.Summary( -+ 'grub2 version must be upgrade to version >= 2.02-0.64, ' -+ 'otherwise system upgrade will get failed after reboot.' -+ ), -+ reporting.Severity(reporting.Severity.HIGH), -+ reporting.Flags([reporting.Flags.INHIBITOR]), -+ reporting.Remediation(commands=commands), -+ reporting.RelatedResource('package', 'grub2'), -+ ]) -+ -+ if has_package(InstalledRedHatSignedRPM, 'python-devel'): -+ python_devel_version = self.get_releasever_of_rpm('python-devel') -+ -+ if self.compare_version(python_devel_version, '77.el7_6') <= 0: -+ answer = self.get_answers(self.dialogs[1]) -+ if answer.get('confirm') == True: -+ subprocess.call(['yum', 'update', '-y', 'python-devel']) -+ else: -+ commands = [['yum', '-y', 'update', 'python-devel']] -+ create_report([ -+ reporting.Title('python-devel version is too low for system upgrade'), -+ reporting.Summary( -+ 'python-devel version must be upgrade to version > 2.7.5-77, ' -+ 'otherwise system upgrade will get failed after reboot.' -+ ), -+ reporting.Severity(reporting.Severity.HIGH), -+ reporting.Flags([reporting.Flags.INHIBITOR]), -+ reporting.Remediation(commands=commands), -+ reporting.RelatedResource('package', 'python-devel'), -+ ]) --- -1.8.3.1 - diff --git a/0042-Report-inhibitor-message-to-SMC.patch b/0042-Report-inhibitor-message-to-SMC.patch deleted file mode 100644 index 8df3a4a..0000000 --- a/0042-Report-inhibitor-message-to-SMC.patch +++ /dev/null @@ -1,37 +0,0 @@ -From cc157238b9fe439a420db7760749ad985b51c62d Mon Sep 17 00:00:00 2001 -From: wangzhe -Date: Tue, 25 Apr 2023 17:25:49 +0800 -Subject: [PATCH] Report inhibitor message to SMC. - ---- - .../verifycheckresults/libraries/verifycheckresults.py | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/verifycheckresults/libraries/verifycheckresults.py b/repos/system_upgrade/el7toel8/actors/verifycheckresults/libraries/verifycheckresults.py -index 63e65e8..4d8cb5d 100644 ---- a/repos/system_upgrade/el7toel8/actors/verifycheckresults/libraries/verifycheckresults.py -+++ b/repos/system_upgrade/el7toel8/actors/verifycheckresults/libraries/verifycheckresults.py -@@ -1,8 +1,19 @@ - from leapp.exceptions import RequestStopAfterPhase - from leapp.libraries.stdlib import api - from leapp.reporting import Report -+from leapp.libraries.common import smc_interface - -+inhibitor_list = [] -+inhibitor_flag = 0 - - def check(): -- if [msg for msg in api.consume(Report) if 'inhibitor' in msg.report.get('flags', [])]: -+ for msg in api.consume(Report): -+ if 'inhibitor' in msg.report.get('flags', []): -+ global inhibitor_flag -+ inhibitor_flag = 1 -+ inhibitor_list.append(str(msg.report.get('title', []))) -+ -+ if inhibitor_flag == 1: -+ # The err_msg length is currently limited to 512, which can be adjusted -+ smc_interface.update_progress_infomation(err_no=199, err_msg="|".join(inhibitor_list)[:512]) - raise RequestStopAfterPhase() --- -1.8.3.1 - diff --git a/0043-Fix-the-memory-unit-error.patch b/0043-Fix-the-memory-unit-error.patch deleted file mode 100644 index 73c618d..0000000 --- a/0043-Fix-the-memory-unit-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -From eea594340a1bb07aaa606703e637630f5f7d0c15 Mon Sep 17 00:00:00 2001 -From: wangzhe -Date: Fri, 12 May 2023 18:00:15 +0800 -Subject: [PATCH] Fix the memory unit error - ---- - .../el7toel8/actors/checkmemory/libraries/checkmemory.py | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/checkmemory/libraries/checkmemory.py b/repos/system_upgrade/el7toel8/actors/checkmemory/libraries/checkmemory.py -index e1ac567..bf6fbee 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkmemory/libraries/checkmemory.py -+++ b/repos/system_upgrade/el7toel8/actors/checkmemory/libraries/checkmemory.py -@@ -5,10 +5,10 @@ from leapp.libraries.stdlib import api - from leapp.models import MemoryInfo - - min_req_memory = { -- architecture.ARCH_X86_64: 1536, # 1.5G -- architecture.ARCH_ARM64: 2048, # 2Gb -- architecture.ARCH_PPC64LE: 2048, # 2Gb -- architecture.ARCH_S390X: 1024 # 1Gb -+ architecture.ARCH_X86_64: 1572864, # 1.5G -+ architecture.ARCH_ARM64: 2097152, # 2Gb -+ architecture.ARCH_PPC64LE: 2097152, # 2Gb -+ architecture.ARCH_S390X: 1048576 # 1Gb - } - - -@@ -33,8 +33,8 @@ def process(): - - if minimum_req_error: - title = 'Minimum memory requirements for Anolis 8 are not met' -- summary = 'Memory detected: {} KiB, required: {} KiB'.format(minimum_req_error['detected'], -- minimum_req_error['minimal_req']) -+ summary = 'Memory detected: {} MiB, required: {} MiB'.format(int(minimum_req_error['detected'] / 1024), -+ int(minimum_req_error['minimal_req'] / 1024)) - reporting.create_report([ - reporting.Title(title), - reporting.Summary(summary), --- -1.8.3.1 - diff --git a/0044-Setup-3rd-repo-available-if-some-pkg-installed-from-.patch b/0044-Setup-3rd-repo-available-if-some-pkg-installed-from-.patch deleted file mode 100644 index c3e8eea..0000000 --- a/0044-Setup-3rd-repo-available-if-some-pkg-installed-from-.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 8f39187682681f8687fcb8692c4677abf7195297 Mon Sep 17 00:00:00 2001 -From: ZhouWeitao -Date: Wed, 17 May 2023 17:06:29 +0800 -Subject: [PATCH] Setup 3rd repo available if some pkg installed from 3rd repo. - -Signed-off-by: ZhouWeitao ---- - .../el7toel8/actors/setup3rdrepos/actor.py | 42 ++++++++++++++++++++++ - 1 file changed, 42 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/setup3rdrepos/actor.py - -diff --git a/repos/system_upgrade/el7toel8/actors/setup3rdrepos/actor.py b/repos/system_upgrade/el7toel8/actors/setup3rdrepos/actor.py -new file mode 100644 -index 0000000..a983e6e ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/setup3rdrepos/actor.py -@@ -0,0 +1,42 @@ -+import platform -+ -+from leapp.actors import Actor -+from leapp.libraries.common import repofileutils -+from leapp.libraries.common.rpms import has_package -+from leapp.models import (CustomTargetRepository, CustomTargetRepositoryFile, InstalledUnsignedRPM) -+from leapp.tags import FactsPhaseTag, IPUWorkflowTag -+ -+CANDIDATE_REPOS = ['nodesource', 'zabbix', 'zabbix-frontend'] -+ -+class Setup3rdRepos(Actor): -+ """ -+ Setup 3rd repositories available if there is pkg installed from 3rd repo. -+ """ -+ -+ name = 'setup3rdrepos' -+ consumes = (CustomTargetRepositoryFile, InstalledUnsignedRPM) -+ produces = (CustomTargetRepository,) -+ tags = (IPUWorkflowTag, FactsPhaseTag) -+ -+ def process(self): -+ repos_3rd = set() -+ for rpm_pkgs in self.consume(InstalledUnsignedRPM): -+ for pkg in rpm_pkgs.items: -+ if pkg.repository in CANDIDATE_REPOS: -+ repos_3rd.add(pkg.repository) -+ -+ custom_repos_map = {} -+ for ctrf in self.consume(CustomTargetRepositoryFile): -+ repofile = repofileutils.parse_repofile(ctrf.file) -+ for repo in repofile.data: -+ custom_repos_map[repo.repoid] = repo -+ -+ for repo in repos_3rd: -+ repoid = repo + '-migrate' -+ if repoid in custom_repos_map.keys(): -+ self.produce(CustomTargetRepository( -+ repoid=custom_repos_map[repoid].repoid, -+ name=custom_repos_map[repoid].name, -+ baseurl=custom_repos_map[repoid].baseurl, -+ enabled=True, -+ )) --- -1.8.3.1 - diff --git a/0045-Fix-bug-with-existing-symlink-in-handleyumconfig.patch b/0045-Fix-bug-with-existing-symlink-in-handleyumconfig.patch deleted file mode 100644 index 9f621ea..0000000 --- a/0045-Fix-bug-with-existing-symlink-in-handleyumconfig.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b9b3830dfeb2626bd936585150aeffb558c37a60 Mon Sep 17 00:00:00 2001 -From: wangcichen -Date: Tue, 16 May 2023 23:20:44 +0800 -Subject: [PATCH] Fix bug with existing symlink in handleyumconfig - -Signed-off-by: wangcichen ---- - repos/system_upgrade/el7toel8/tools/handleyumconfig | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/repos/system_upgrade/el7toel8/tools/handleyumconfig b/repos/system_upgrade/el7toel8/tools/handleyumconfig -index af0bc48..67dc94d 100755 ---- a/repos/system_upgrade/el7toel8/tools/handleyumconfig -+++ b/repos/system_upgrade/el7toel8/tools/handleyumconfig -@@ -10,15 +10,17 @@ is_dir_empty() { - - handle_dir() { - # Move all files from $1 to $2 when the /etc/yum/$1 is not empty -+ # and not already a link - # Then remove the $1 directory and relink it to $2 - # param $1: dirname under /etc/yum path - # param $2: dirname under /etc/dnf path -+ if [ "$(readlink /etc/yum/$1)" == "../dnf/$2" ]; then -+ return -+ fi - if ! is_dir_empty "/etc/yum/$1"; then - mv /etc/yum/$1/* /etc/dnf/$2/ - fi - -- # FIXME: do not care whether these were already symlinks for now -- # just remove it - rm -rf /etc/yum/$1 - - #relink --- -2.22.0 - -- Gitee From 67c122f5f3f266701acb73d92711171944627781 Mon Sep 17 00:00:00 2001 From: wangzhe Date: Thu, 25 May 2023 19:20:07 +0800 Subject: [PATCH 2/5] switch from rpm tree to source tree, remove 0020~0029 patch Signed-off-by: wangzhe --- 0020-add-tomcat-detection.patch | 49 --- 0021-support-anolis7.patch | 42 -- 0022-add-checklvm2cluster.patch | 53 --- ...ernel-version-check-of-anolis-kernel.patch | 26 -- 0024-remove-unofficial-url.patch | 382 ------------------ 0026-Add-checkbaota-actor.patch | 84 ---- ...rade-write-efi-vars-for-ecs-firmware.patch | 70 ---- ...epo-option-to-upgrade-kernel-to-RHCK.patch | 46 --- ...onfiguration-remains-after-migration.patch | 255 ------------ 9 files changed, 1007 deletions(-) delete mode 100644 0020-add-tomcat-detection.patch delete mode 100644 0021-support-anolis7.patch delete mode 100644 0022-add-checklvm2cluster.patch delete mode 100644 0023-fix-kernel-version-check-of-anolis-kernel.patch delete mode 100644 0024-remove-unofficial-url.patch delete mode 100644 0026-Add-checkbaota-actor.patch delete mode 100644 0027-upgrade-write-efi-vars-for-ecs-firmware.patch delete mode 100644 0028-add-disablerepo-option-to-upgrade-kernel-to-RHCK.patch delete mode 100644 0029-Service-configuration-remains-after-migration.patch diff --git a/0020-add-tomcat-detection.patch b/0020-add-tomcat-detection.patch deleted file mode 100644 index 54931b8..0000000 --- a/0020-add-tomcat-detection.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e45592bc72fc78fc353ee6b245b703208ed70374 Mon Sep 17 00:00:00 2001 -From: qianlai -Date: Wed, 20 Oct 2021 15:29:58 +0800 -Subject: [PATCH 3/4] add tomcat detection - ---- - .../el7toel8/actors/checktomcat/actor.py | 30 +++++++++++++++++++ - 1 file changed, 30 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/checktomcat/actor.py - -diff --git a/repos/system_upgrade/el7toel8/actors/checktomcat/actor.py b/repos/system_upgrade/el7toel8/actors/checktomcat/actor.py -new file mode 100644 -index 0000000..fa7f6b6 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checktomcat/actor.py -@@ -0,0 +1,30 @@ -+from leapp.actors import Actor -+from leapp.libraries.common.rpms import has_package -+from leapp.models import InstalledRedHatSignedRPM -+from leapp.reporting import Report, create_report -+from leapp import reporting -+from leapp.tags import ChecksPhaseTag, IPUWorkflowTag -+ -+ -+class CheckTomcat(Actor): -+ """ -+ Check if tomcat is installed. If yes, write information about important changes. -+ """ -+ -+ name = 'checktomcat' -+ consumes = (InstalledRedHatSignedRPM,) -+ produces = (Report,) -+ tags = (ChecksPhaseTag, IPUWorkflowTag) -+ -+ def process(self): -+ if has_package(InstalledRedHatSignedRPM, 'tomcat'): -+ create_report([ -+ reporting.Title('Changes of deploying tomcat in Anolis 8'), -+ reporting.Summary( -+ 'In Anolis 8, tomcat package is removed, tomcat contains the following commands:tomcat, tomcat-digest, tomcat-tool-wapper.\n' -+ 'But tomcat is also compatible with Anolis 8, you can downlaod and install manually.\n' -+ 'Please refer to "https://openanolis.cn/sig/third_software_compatibility/doc/392149640260550929".' -+ ), -+ reporting.Severity(reporting.Severity.LOW), -+ reporting.RelatedResource('package', 'tomcat') -+ ]) --- -2.19.1.6.gb485710b - diff --git a/0021-support-anolis7.patch b/0021-support-anolis7.patch deleted file mode 100644 index 354af4d..0000000 --- a/0021-support-anolis7.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 29358ab705aa253e3b1aeb3001bebb41fd445d34 Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Mon, 27 Dec 2021 20:45:33 +0800 -Subject: [PATCH 4/4] support anolis7 - -Signed-off-by: Chunmei Xu ---- - .../el7toel8/actors/redhatsignedrpmscanner/actor.py | 3 ++- - repos/system_upgrade/el7toel8/libraries/config/version.py | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/redhatsignedrpmscanner/actor.py b/repos/system_upgrade/el7toel8/actors/redhatsignedrpmscanner/actor.py -index 0e4314a..eafe3bd 100644 ---- a/repos/system_upgrade/el7toel8/actors/redhatsignedrpmscanner/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/redhatsignedrpmscanner/actor.py -@@ -27,7 +27,8 @@ class RedHatSignedRpmScanner(Actor): - 'fd372689897da07a', - '45689c882fa658e0', - '24c6a8a7f4a80eb5', -- '6c7cb6ef305d49d6'] -+ '6c7cb6ef305d49d6', -+ '619140084873f7c5'] - - signed_pkgs = InstalledRedHatSignedRPM() - unsigned_pkgs = InstalledUnsignedRPM() -diff --git a/repos/system_upgrade/el7toel8/libraries/config/version.py b/repos/system_upgrade/el7toel8/libraries/config/version.py -index 6374599..95889a5 100644 ---- a/repos/system_upgrade/el7toel8/libraries/config/version.py -+++ b/repos/system_upgrade/el7toel8/libraries/config/version.py -@@ -13,7 +13,8 @@ OP_MAP = { - - # Note: 'rhel-alt' is detected when on 'rhel' with kernel 4.x - SUPPORTED_VERSIONS = {'rhel': ['7.9'], 'rhel-alt': ['7.6'], 'rhel-saphana': ['7.7'], -- 'centos': ['7.0', '7.1', '7.2', '7.3', '7.4', '7.5', '7.6', '7.7', '7.8', '7.9']} -+ 'centos': ['7.0', '7.1', '7.2', '7.3', '7.4', '7.5', '7.6', '7.7', '7.8', '7.9'], -+ 'anolis': ['7.7', '7.9']} - - def _version_to_tuple(version): - """Converts the version string ``major.minor`` to ``(major, minor)`` int tuple.""" --- -2.19.1.6.gb485710b - diff --git a/0022-add-checklvm2cluster.patch b/0022-add-checklvm2cluster.patch deleted file mode 100644 index cf5744c..0000000 --- a/0022-add-checklvm2cluster.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a4c558aeb82793ecb5141b1f32f5af5df74160b9 Mon Sep 17 00:00:00 2001 -From: mgb01105731 -Date: Fri, 14 Jan 2022 19:11:40 +0800 -Subject: [PATCH] =?UTF-8?q?=20Bug=20352=20;=20Report=20is=20https://yuque.?= - =?UTF-8?q?antfin.com/docs/share/149a54d0-da97-40c8-8e87-6a4dc72d47f0=3F#?= - =?UTF-8?q?=20=E3=80=8A=E5=AD=98=E5=9C=A8lvm2-cluster=E6=97=B6=E9=98=BB?= - =?UTF-8?q?=E6=AD=A2=E8=BF=81=E7=A7=BB=EF=BC=88leapp=EF=BC=89=E3=80=8B?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - .../el7toel8/actors/checklvm2cluster/actor.py | 28 +++++++++++++++++++ - 1 file changed, 28 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/checklvm2cluster/actor.py - -diff --git a/repos/system_upgrade/el7toel8/actors/checklvm2cluster/actor.py b/repos/system_upgrade/el7toel8/actors/checklvm2cluster/actor.py -new file mode 100644 -index 0000000..41cae25 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checklvm2cluster/actor.py -@@ -0,0 +1,28 @@ -+from leapp.actors import Actor -+from leapp.libraries.common.rpms import has_package -+from leapp.models import InstalledRedHatSignedRPM -+from leapp.reporting import Report, create_report -+from leapp import reporting -+from leapp.reporting import create_report -+from leapp.tags import ChecksPhaseTag, IPUWorkflowTag -+ -+ -+class Checklvm2cluster(Actor): -+ """ -+ Check if lvm2-cluster is installed. If yes, stop upgrade -+ """ -+ -+ name = 'check-lvm2-cluster' -+ consumes = (InstalledRedHatSignedRPM,) -+ produces = (Report,) -+ tags = (ChecksPhaseTag, IPUWorkflowTag) -+ -+ def process(self): -+ if has_package(InstalledRedHatSignedRPM, 'lvm2-cluster'): -+ create_report([ -+ reporting.Title('lvm2-cluster is installed, lvm2-cluster cannot be processed during upgrade'), -+ reporting.Summary('lvm2-cluster affects the upgrade and needs to be uninstalled first'), -+ reporting.Severity(reporting.Severity.HIGH), -+ reporting.Remediation(hint='Use "yum -y remove lvm2-cluster" before "leapp preupgrade --no-rhsm" '), -+ reporting.Flags([reporting.Flags.INHIBITOR]) -+ ]) --- -2.19.1.6.gb485710b - diff --git a/0023-fix-kernel-version-check-of-anolis-kernel.patch b/0023-fix-kernel-version-check-of-anolis-kernel.patch deleted file mode 100644 index c201a72..0000000 --- a/0023-fix-kernel-version-check-of-anolis-kernel.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 678561b5807f1a82496f6e01b2dd4542cb500722 Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Tue, 25 Jan 2022 19:49:41 +0800 -Subject: [PATCH] fix kernel version check of anolis kernel - -Signed-off-by: Chunmei Xu ---- - .../scaninstalledtargetkernelversion/libraries/scankernel.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/scaninstalledtargetkernelversion/libraries/scankernel.py b/repos/system_upgrade/el7toel8/actors/scaninstalledtargetkernelversion/libraries/scankernel.py -index 594d536..6b427d0 100644 ---- a/repos/system_upgrade/el7toel8/actors/scaninstalledtargetkernelversion/libraries/scankernel.py -+++ b/repos/system_upgrade/el7toel8/actors/scaninstalledtargetkernelversion/libraries/scankernel.py -@@ -12,7 +12,7 @@ def _get_kernel_version(kernel_name): - for kernel in kernels: - # name-version-release - we want the last two fields only - version = '-'.join(kernel.split('-')[-2:]) -- if 'el8' in version: -+ if 'an8' in version: - return version - return '' - --- -2.19.1.6.gb485710b - diff --git a/0024-remove-unofficial-url.patch b/0024-remove-unofficial-url.patch deleted file mode 100644 index f5a0b13..0000000 --- a/0024-remove-unofficial-url.patch +++ /dev/null @@ -1,382 +0,0 @@ -From a01daee6765b0568eb16f3559a6d63afa2285a8a Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Tue, 25 Jan 2022 19:50:36 +0800 -Subject: [PATCH] remove unofficial url - -Signed-off-by: Chunmei Xu ---- - .../el7toel8/actors/checkbtrfs/actor.py | 4 ---- - .../el7toel8/actors/checkcpu/libraries/cpu.py | 4 ---- - .../checkhacluster/libraries/checkhacluster.py | 7 ------- - .../checkipaserver/libraries/checkipaserver.py | 16 +--------------- - .../el7toel8/actors/checkmemory/actor.py | 1 - - .../checksaphana/libraries/checksaphana.py | 6 +----- - .../libraries/checktargetrepos.py | 6 +----- - .../actors/kernel/checkkerneldrivers/actor.py | 4 +--- - .../el7toel8/actors/localreposinhibit/actor.py | 13 +------------ - .../actors/persistentnetnamesdisable/actor.py | 2 +- - .../libraries/peseventsscanner.py | 3 +-- - .../el7toel8/actors/pythoninformuser/actor.py | 5 +---- - .../el7toel8/actors/quaggareport/actor.py | 6 ------ - .../libraries/repositoriesblacklist.py | 10 +--------- - .../libraries/repositoriesmapping.py | 4 +--- - .../el7toel8/actors/tcpwrapperscheck/actor.py | 5 +---- - .../libraries/vsftpdconfigcheck.py | 5 +---- - 17 files changed, 12 insertions(+), 89 deletions(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/checkbtrfs/actor.py b/repos/system_upgrade/el7toel8/actors/checkbtrfs/actor.py -index 6f6941d..74e431f 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkbtrfs/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/checkbtrfs/actor.py -@@ -29,10 +29,6 @@ class CheckBtrfs(Actor): - 'initial release of Red Hat Enterprise Linux 6 and Red Hat Enterprise Linux 7. As of ' - 'versions 6.6 and 7.4 this technology has been deprecated and removed in Anolis8.' - ), -- reporting.ExternalLink( -- title='Considerations in adopting Anolis 8 - btrfs has been removed.', -- url='https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/considerations_in_adopting_rhel_8/file-systems-and-storage_considerations-in-adopting-rhel-8#btrfs-has-been-removed_file-systems-and-storage' # noqa: E501; pylint: disable=line-too-long -- ), - reporting.Severity(reporting.Severity.HIGH), - reporting.Flags([reporting.Flags.INHIBITOR]), - reporting.Tags([reporting.Tags.FILESYSTEM]), -diff --git a/repos/system_upgrade/el7toel8/actors/checkcpu/libraries/cpu.py b/repos/system_upgrade/el7toel8/actors/checkcpu/libraries/cpu.py -index 3fc9c48..619a4e0 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkcpu/libraries/cpu.py -+++ b/repos/system_upgrade/el7toel8/actors/checkcpu/libraries/cpu.py -@@ -32,9 +32,5 @@ def process(): - reporting.Severity(reporting.Severity.HIGH), - reporting.Tags([reporting.Tags.SANITY]), - reporting.Flags([reporting.Flags.INHIBITOR]), -- reporting.ExternalLink( -- title="Considerations in adopting Anolis 8", -- url=("https://access.redhat.com/ecosystem/hardware/#/search?p=1&" -- "c_version=Red%20Hat%20Enterprise%20Linux%208&ch_architecture=s390x")) - ] - reporting.create_report(report) -diff --git a/repos/system_upgrade/el7toel8/actors/checkhacluster/libraries/checkhacluster.py b/repos/system_upgrade/el7toel8/actors/checkhacluster/libraries/checkhacluster.py -index dd3e1c8..73511c3 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkhacluster/libraries/checkhacluster.py -+++ b/repos/system_upgrade/el7toel8/actors/checkhacluster/libraries/checkhacluster.py -@@ -18,13 +18,6 @@ def inhibit(node_type): - reporting.Severity(reporting.Severity.HIGH), - reporting.Tags([reporting.Tags.HIGH_AVAILABILITY]), - reporting.Flags([reporting.Flags.INHIBITOR]), -- reporting.ExternalLink( -- url="https://access.redhat.com/articles/2059253", -- title=( -- "Recommended Practices for Applying Software Updates" -- " to a RHEL High Availability or Resilient Storage Cluster" -- ), -- ), - reporting.Remediation( - hint=( - "Destroy the existing HA cluster" -diff --git a/repos/system_upgrade/el7toel8/actors/checkipaserver/libraries/checkipaserver.py b/repos/system_upgrade/el7toel8/actors/checkipaserver/libraries/checkipaserver.py -index b5dff87..2f107c4 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkipaserver/libraries/checkipaserver.py -+++ b/repos/system_upgrade/el7toel8/actors/checkipaserver/libraries/checkipaserver.py -@@ -1,9 +1,5 @@ - from leapp import reporting - --MIGRATION_GUIDE = ( -- "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux" -- "/8/html/installing_identity_management/migrate-7-to-8_migrating" --) - - - def ipa_inhibit_upgrade(ipainfo): -@@ -16,14 +12,7 @@ def ipa_inhibit_upgrade(ipainfo): - ), - reporting.Summary( - "An IdM server installation was detected on the system. IdM " -- "does not support in-place upgrade to Anolis 8. Please follow " -- "the migration guide lines." -- ), -- reporting.Remediation( -- hint="Please follow the IdM RHEL 7 to 8 migration guide lines." -- ), -- reporting.ExternalLink( -- url=MIGRATION_GUIDE, title="Migrating IdM from RHEL 7 to 8", -+ "does not support in-place upgrade to Anolis 8." - ), - reporting.Severity(reporting.Severity.HIGH), - reporting.Flags([reporting.Flags.INHIBITOR]), -@@ -56,9 +45,6 @@ def ipa_warn_pkg_installed(ipainfo): - hint="Remove unused ipa-server package", - commands=[["yum", "remove", "-y", "ipa-server"]], - ), -- reporting.ExternalLink( -- url=MIGRATION_GUIDE, title="Migrating IdM from RHEL 7 to 8", -- ), - reporting.Severity(reporting.Severity.MEDIUM), - reporting.Tags([reporting.Tags.SERVICES]), - reporting.RelatedResource("package", "ipa-server"), -diff --git a/repos/system_upgrade/el7toel8/actors/checkmemory/actor.py b/repos/system_upgrade/el7toel8/actors/checkmemory/actor.py -index b26ae6d..9852721 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkmemory/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/checkmemory/actor.py -@@ -8,7 +8,6 @@ class CheckMemory(Actor): - """ - The actor check the size of RAM against Anolis8 minimal hardware requirements - -- Using the following resource: https://access.redhat.com/articles/rhel-limits - """ - - name = 'checkmemory' -diff --git a/repos/system_upgrade/el7toel8/actors/checksaphana/libraries/checksaphana.py b/repos/system_upgrade/el7toel8/actors/checksaphana/libraries/checksaphana.py -index 5e9625b..00166c9 100644 ---- a/repos/system_upgrade/el7toel8/actors/checksaphana/libraries/checksaphana.py -+++ b/repos/system_upgrade/el7toel8/actors/checksaphana/libraries/checksaphana.py -@@ -177,16 +177,12 @@ def platform_check(): - reporting.create_report([ - reporting.Title('SAP HANA upgrades are only supported on X86_64 systems'), - reporting.Summary( -- ('Upgrades for SAP HANA are only supported on X86_64 systems.' -- ' For more information please consult the documentation.') -+ ('Upgrades for SAP HANA are only supported on X86_64 systems.') - ), - reporting.Severity(reporting.Severity.HIGH), - reporting.Tags([reporting.Tags.SANITY]), - reporting.Flags([reporting.Flags.INHIBITOR]), - reporting.Audience('sysadmin'), -- reporting.ExternalLink( -- url='https://access.redhat.com/solutions/5533441', -- title='How do I upgrade from Red Hat Enterprise Linux 7 to Red Hat Enterprise Linux 8 with SAP HANA') - ]) - return False - -diff --git a/repos/system_upgrade/el7toel8/actors/checktargetrepos/libraries/checktargetrepos.py b/repos/system_upgrade/el7toel8/actors/checktargetrepos/libraries/checktargetrepos.py -index 277f4f8..dbc3e8c 100644 ---- a/repos/system_upgrade/el7toel8/actors/checktargetrepos/libraries/checktargetrepos.py -+++ b/repos/system_upgrade/el7toel8/actors/checktargetrepos/libraries/checktargetrepos.py -@@ -4,8 +4,6 @@ from leapp import reporting - from leapp.libraries.common import config, rhsm - - --_IPU_DOC_URL = ('https://access.redhat.com/documentation/en-us/' -- 'red_hat_enterprise_linux/8/html-single/upgrading_to_rhel_8/index') - # TODO: we need to provide this path in a shared library - CUSTOM_REPO_PATH = '/etc/leapp/files/leapp_upgrade_repositories.repo' - -@@ -72,7 +70,6 @@ def process(): - reporting.Severity(reporting.Severity.HIGH), - reporting.Tags([reporting.Tags.SANITY]), - reporting.Flags([reporting.Flags.INHIBITOR]), -- reporting.ExternalLink(url=_IPU_DOC_URL, title='UPGRADING TO ANOLIS 8'), - reporting.RelatedResource('file', CUSTOM_REPO_PATH), - ]) - elif not (is_ctrf or is_re): -@@ -82,7 +79,7 @@ def process(): - reporting.create_report([ - reporting.Title('Detected "CustomTargetRepositories" without using new provided mechanisms used.'), - reporting.Summary( -- 'Red Hat now provides an official way for using custom' -+ 'Anolis OS now provides an official way for using custom' - ' repositories during the in-place upgrade through' - ' the referred custom repository file or through the' - ' --enablerepo option for leapp. The CustomTargetRepositories' -@@ -95,6 +92,5 @@ def process(): - ' message.' - )), - reporting.Severity(reporting.Severity.INFO), -- reporting.ExternalLink(url=_IPU_DOC_URL, title='UPGRADING TO ANOLIS 8'), - reporting.RelatedResource('file', CUSTOM_REPO_PATH), - ]) -diff --git a/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py -index 99bdd98..e1ce303 100644 ---- a/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py -@@ -34,11 +34,9 @@ class CheckKernelDrivers(Actor): - if conflicting: - title = ('Detected loaded kernel drivers which have been removed ' - 'in Anolis 8. Upgrade cannot proceed.') -- URL = ('https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/' -- 'considerations_in_adopting_rhel_8/index#removed-device-drivers_hardware-enablement') - summary = ('Support for the following Anolis 7 ' - 'device drivers has been removed in Anolis 8: \n - {}' -- '\nPlease see {} for details.'.format('\n - '.join(conflicting), URL)) -+ '\n'.format('\n - '.join(conflicting))) - remediation = ('Please disable detected kernel drivers in ' - 'order to proceed with the upgrade process using the rmmod or modprobe -r.') - create_report([ -diff --git a/repos/system_upgrade/el7toel8/actors/localreposinhibit/actor.py b/repos/system_upgrade/el7toel8/actors/localreposinhibit/actor.py -index 149783b..6309d59 100644 ---- a/repos/system_upgrade/el7toel8/actors/localreposinhibit/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/localreposinhibit/actor.py -@@ -53,19 +53,8 @@ class LocalReposInhibit(Actor): - reporting.Remediation( - hint=( - "By using Apache HTTP Server you can expose " -- "your local repository via http. See the linked " -- "article for details. " -+ "your local repository via http." - ) - ), -- reporting.ExternalLink( -- title=( -- "Customizing your Red Hat Enterprise Linux " -- "in-place upgrade" -- ), -- url=( -- "https://access.redhat.com/articles/4977891/" -- "#repos-known-issues" -- ), -- ), - ] - ) -diff --git a/repos/system_upgrade/el7toel8/actors/persistentnetnamesdisable/actor.py b/repos/system_upgrade/el7toel8/actors/persistentnetnamesdisable/actor.py -index 4e512c1..154ab9d 100644 ---- a/repos/system_upgrade/el7toel8/actors/persistentnetnamesdisable/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/persistentnetnamesdisable/actor.py -@@ -44,7 +44,7 @@ class PersistentNetNamesDisable(Actor): - reporting.Summary( - 'Detected multiple network interfaces using unstable kernel names (e.g. eth0, eth1). ' - 'Upgrade process can not continue because stability of names can not be guaranteed. ' -- 'Please read the article at https://access.redhat.com/solutions/4067471 for more information.' -+ 'Please read the solution in migration guide and https://www.yuque.com/anolis-docs/kbase/.' - ), - reporting.Severity(reporting.Severity.HIGH), - reporting.Tags([reporting.Tags.NETWORK]), -diff --git a/repos/system_upgrade/el7toel8/actors/peseventsscanner/libraries/peseventsscanner.py b/repos/system_upgrade/el7toel8/actors/peseventsscanner/libraries/peseventsscanner.py -index 455bbd4..4d955a0 100644 ---- a/repos/system_upgrade/el7toel8/actors/peseventsscanner/libraries/peseventsscanner.py -+++ b/repos/system_upgrade/el7toel8/actors/peseventsscanner/libraries/peseventsscanner.py -@@ -138,8 +138,7 @@ def get_events(pes_events_filepath): - return parse_pes_events_file(pes_events_filepath) - except (ValueError, KeyError): - title = 'Missing/Invalid PES data file ({})'.format(pes_events_filepath) -- summary = 'Read documentation at: https://access.redhat.com/articles/3664871 for more information ' \ -- 'about how to retrieve the files' -+ summary = 'Please contact migration owner for help.' - reporting.create_report([ - reporting.Title(title), - reporting.Summary(summary), -diff --git a/repos/system_upgrade/el7toel8/actors/pythoninformuser/actor.py b/repos/system_upgrade/el7toel8/actors/pythoninformuser/actor.py -index a64e00a..4455b04 100644 ---- a/repos/system_upgrade/el7toel8/actors/pythoninformuser/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/pythoninformuser/actor.py -@@ -12,19 +12,16 @@ class PythonInformUser(Actor): - tags = (ChecksPhaseTag, IPUWorkflowTag) - - def process(self): -- url = "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/configuring_basic_system_settings/#using-python3" # noqa: E501; pylint: disable=line-too-long - title = "Difference in Python versions and support in Anolis 8" - summary = ("In Anolis 8, there is no 'python' command." - " Python 3 (backward incompatible) is the primary Python version" -- " and Python 2 is available with limited support and limited set of packages." -- " Read more here: {}".format(url)) -+ " and Python 2 is available with limited support and limited set of packages.") - create_report([ - reporting.Title(title), - reporting.Summary(summary), - reporting.Severity(reporting.Severity.HIGH), - reporting.Tags([reporting.Tags.PYTHON]), - reporting.Audience('developer'), -- reporting.ExternalLink(url, title), - reporting.Remediation(hint='Please run "alternatives --set python /usr/bin/python3" after upgrade'), - reporting.RelatedResource('package', 'python'), - reporting.RelatedResource('package', 'python2'), -diff --git a/repos/system_upgrade/el7toel8/actors/quaggareport/actor.py b/repos/system_upgrade/el7toel8/actors/quaggareport/actor.py -index 3b930cf..9645a0f 100644 ---- a/repos/system_upgrade/el7toel8/actors/quaggareport/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/quaggareport/actor.py -@@ -31,12 +31,6 @@ class QuaggaReport(Actor): - if 'babeld' in quagga_facts.active_daemons or 'babeld' in quagga_facts.enabled_daemons: - create_report([ - reporting.Title('Babeld is not available in FRR'), -- reporting.ExternalLink( -- url='https://access.redhat.com/' -- 'documentation/en-us/red_hat_enterprise_linux/8/html/' -- 'configuring_and_managing_networking/setting-your-rou' -- 'ting-protocols_configuring-and-managing-networking', -- title='Setting routing protocols in Anolis8'), - reporting.Summary( - 'babeld daemon which was a part of quagga implementation in RHEL7 ' - 'is not available in Anolis8 in FRR due to licensing issues.' -diff --git a/repos/system_upgrade/el7toel8/actors/repositoriesblacklist/libraries/repositoriesblacklist.py b/repos/system_upgrade/el7toel8/actors/repositoriesblacklist/libraries/repositoriesblacklist.py -index ec4949c..a0fee13 100644 ---- a/repos/system_upgrade/el7toel8/actors/repositoriesblacklist/libraries/repositoriesblacklist.py -+++ b/repos/system_upgrade/el7toel8/actors/repositoriesblacklist/libraries/repositoriesblacklist.py -@@ -57,7 +57,7 @@ def process(): - reporting.Title("Excluded Anolis 8 repositories"), - reporting.Summary( - "The following repositories are not supported by " -- "Red Hat and are excluded from the list of repositories " -+ "Anolis OS and are excluded from the list of repositories " - "used during the upgrade.\n- {}".format( - "\n- ".join(reposid_blacklist) - ) -@@ -65,13 +65,5 @@ def process(): - reporting.Severity(reporting.Severity.INFO), - reporting.Tags([reporting.Tags.REPOSITORY]), - reporting.Flags([reporting.Flags.FAILURE]), -- reporting.ExternalLink( -- url=( -- "https://access.redhat.com/documentation/en-us/" -- "red_hat_enterprise_linux/8/html/package_manifest/" -- "codereadylinuxbuilder-repository." -- ), -- title="CodeReady Linux Builder repository", -- ), - ] - reporting.create_report(report) -diff --git a/repos/system_upgrade/el7toel8/actors/repositoriesmapping/libraries/repositoriesmapping.py b/repos/system_upgrade/el7toel8/actors/repositoriesmapping/libraries/repositoriesmapping.py -index f1c8323..83f230f 100644 ---- a/repos/system_upgrade/el7toel8/actors/repositoriesmapping/libraries/repositoriesmapping.py -+++ b/repos/system_upgrade/el7toel8/actors/repositoriesmapping/libraries/repositoriesmapping.py -@@ -13,9 +13,7 @@ REPOMAP_FILE = '/etc/leapp/files/repomap.csv' - def _inhibit_upgrade(msg): - raise StopActorExecutionError( - msg, -- details={'hint': ('Read documentation at the following link for more' -- ' information about how to retrieve the valid file:' -- ' https://access.redhat.com/articles/3664871')}) -+ details={'hint': ('Contact migration owner to get valid files.')}) - - - def _read_repofile(path): -diff --git a/repos/system_upgrade/el7toel8/actors/tcpwrapperscheck/actor.py b/repos/system_upgrade/el7toel8/actors/tcpwrapperscheck/actor.py -index d7d7331..7d863df 100644 ---- a/repos/system_upgrade/el7toel8/actors/tcpwrapperscheck/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/tcpwrapperscheck/actor.py -@@ -66,13 +66,10 @@ class TcpWrappersCheck(Actor): - 'There is some configuration affecting installed packages (namely {}) ' - 'in /etc/hosts.deny or /etc/hosts.allow, which ' - 'is no longer going to be effective after update. ' -+ 'Firewalld can be used as a firewall level replacement for TCP Wrappers.' - 'Please migrate it manually.'.format(', '.join(found_packages)) - ), - reporting.Severity(reporting.Severity.HIGH), -- reporting.ExternalLink( -- title='Replacing TCP Wrappers in Anolis 8', -- url='https://access.redhat.com/solutions/3906701' -- ), - reporting.Tags([reporting.Tags.SECURITY, reporting.Tags.NETWORK]), - reporting.Flags([reporting.Flags.INHIBITOR]), - reporting.RelatedResource('file', '/etc/hosts.allow'), -diff --git a/repos/system_upgrade/el7toel8/actors/vsftpdconfigcheck/libraries/vsftpdconfigcheck.py b/repos/system_upgrade/el7toel8/actors/vsftpdconfigcheck/libraries/vsftpdconfigcheck.py -index a6c307c..b761897 100644 ---- a/repos/system_upgrade/el7toel8/actors/vsftpdconfigcheck/libraries/vsftpdconfigcheck.py -+++ b/repos/system_upgrade/el7toel8/actors/vsftpdconfigcheck/libraries/vsftpdconfigcheck.py -@@ -14,6 +14,7 @@ def check_config_supported(tcpwrap_facts, vsftpd_facts): - 'Some configuration files set the tcp_wrappers option to true and ' - 'there is some vsftpd-related configuration in /etc/hosts.deny ' - 'or /etc/hosts.allow. Please migrate it manually. ' -+ 'Firewalld can be used as a firewall level replacement for TCP Wrappers.' - 'The list of problematic configuration files:{}{}'. - format( - list_separator_fmt, -@@ -23,10 +24,6 @@ def check_config_supported(tcpwrap_facts, vsftpd_facts): - reporting.Severity(reporting.Severity.HIGH), - reporting.Tags([reporting.Tags.SERVICES, reporting.Tags.NETWORK]), - reporting.Flags([reporting.Flags.INHIBITOR]), -- reporting.ExternalLink( -- title='Replacing TCP Wrappers in Anolis 8', -- url='https://access.redhat.com/solutions/3906701' -- ), - reporting.RelatedResource('package', 'tcp_wrappers'), - reporting.RelatedResource('package', 'vsftpd'), - ] + [reporting.RelatedResource('file', str(bc)) for bc in bad_configs]) --- -2.19.1.6.gb485710b - diff --git a/0026-Add-checkbaota-actor.patch b/0026-Add-checkbaota-actor.patch deleted file mode 100644 index 85ff5b2..0000000 --- a/0026-Add-checkbaota-actor.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 9eab504e1cbc6868b9412617f555197331805085 Mon Sep 17 00:00:00 2001 -From: yuki1109 <750172132@qq.com> -Date: Wed, 1 Jun 2022 23:25:25 +0800 -Subject: [PATCH] Add checkbaota actor - -Signed-off-by: yuki1109 <750172132@qq.com> ---- - .../el7toel8/actors/checkbaota/actor.py | 36 +++++++++++++++++++ - .../checkbaota/tests/test_checkbaota.py | 19 ++++++++++ - 2 files changed, 55 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/checkbaota/actor.py - create mode 100644 repos/system_upgrade/el7toel8/actors/checkbaota/tests/test_checkbaota.py - -diff --git a/repos/system_upgrade/el7toel8/actors/checkbaota/actor.py b/repos/system_upgrade/el7toel8/actors/checkbaota/actor.py -new file mode 100644 -index 0000000..808118b ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkbaota/actor.py -@@ -0,0 +1,36 @@ -+from leapp.actors import Actor -+from leapp.libraries.common.rpms import has_package -+from leapp.models import InstalledRPM -+from leapp.reporting import Report, create_report -+from leapp import reporting -+from leapp.reporting import create_report -+from leapp.tags import ChecksPhaseTag, IPUWorkflowTag -+import subprocess -+ -+class Checkbaota(Actor): -+ """ -+ Check if baota is installed. If yes, stop upgrade -+ """ -+ -+ name = 'checkbaota' -+ consumes = (InstalledRPM,) -+ produces = (Report,) -+ tags = (ChecksPhaseTag, IPUWorkflowTag) -+ -+ def process(self): -+ if has_package(InstalledRPM,"openssl"): -+ try: -+ ret = subprocess.check_output(["bt","default"]) -+ if "BT-Panel default info" in ret: -+ create_report([ -+ reporting.Title('Baota is installed, openssl version cannot be processed during upgrade.'), -+ reporting.Summary( -+ 'Baota has openssl-libs cannot be updated to Anolis OS 8.\n' -+ 'You should first backup your application files and data when baota requires openssl-libs. Secondly, install new version for baota after migration and recover the data.'), -+ reporting.Severity(reporting.Severity.HIGH), -+ reporting.Remediation(hint='Please uninstall baota, and then preupgrade again.'), -+ reporting.Flags([reporting.Flags.INHIBITOR]) -+ ]) -+ except: -+ pass -+ -diff --git a/repos/system_upgrade/el7toel8/actors/checkbaota/tests/test_checkbaota.py b/repos/system_upgrade/el7toel8/actors/checkbaota/tests/test_checkbaota.py -new file mode 100644 -index 0000000..253b272 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkbaota/tests/test_checkbaota.py -@@ -0,0 +1,19 @@ -+from leapp.snactor.fixture import current_actor_context -+from leapp.models import InstalledRedHatSignedRPM, RPM -+from leapp.reporting import Report -+ -+RH_PACKAGER = 'Red Hat, Inc. ' -+ -+ -+def create_modulesfacts(installed_rpm): -+ return InstalledRedHatSignedRPM(items=installed_rpm) -+ -+ -+def test_actor_with_openssl_package(current_actor_context): -+ with_openssl = [ -+ RPM(name='openssl', version='1.0.2k', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=with_openssl)) -+ current_actor_context.run() -+ assert current_actor_context.consume(Report) -\ No newline at end of file --- -2.19.1.6.gb485710b - diff --git a/0027-upgrade-write-efi-vars-for-ecs-firmware.patch b/0027-upgrade-write-efi-vars-for-ecs-firmware.patch deleted file mode 100644 index 1e27eb6..0000000 --- a/0027-upgrade-write-efi-vars-for-ecs-firmware.patch +++ /dev/null @@ -1,70 +0,0 @@ -From ce93e314a66020399c22d6aa574be2b92281b9f3 Mon Sep 17 00:00:00 2001 -From: Liwei Ge -Date: Thu, 1 Sep 2022 15:28:14 +0800 -Subject: [PATCH] upgrade: write efi vars for ecs firmware - -also rebrand grub title for upgrade boot ---- - .../libraries/addupgradebootentry.py | 2 +- - .../tests/unit_test_addupgradebootentry.py | 2 +- - .../dracut/85sys-upgrade-redhat/do-upgrade.sh | 18 ++++++++++++++++++ - 3 files changed, 20 insertions(+), 2 deletions(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/addupgradebootentry/libraries/addupgradebootentry.py b/repos/system_upgrade/el7toel8/actors/addupgradebootentry/libraries/addupgradebootentry.py -index c15dd52..4270bd8 100644 ---- a/repos/system_upgrade/el7toel8/actors/addupgradebootentry/libraries/addupgradebootentry.py -+++ b/repos/system_upgrade/el7toel8/actors/addupgradebootentry/libraries/addupgradebootentry.py -@@ -17,7 +17,7 @@ def add_boot_entry(configs=None): - '/usr/sbin/grubby', - '--add-kernel', '{0}'.format(kernel_dst_path), - '--initrd', '{0}'.format(initram_dst_path), -- '--title', 'RHEL-Upgrade-Initramfs', -+ '--title', 'Anolis-Upgrade-Initramfs', - '--copy-default', - '--make-default', - '--args', '{DEBUG} enforcing=0 rd.plymouth=0 plymouth.enable=0'.format(DEBUG=debug) -diff --git a/repos/system_upgrade/el7toel8/actors/addupgradebootentry/tests/unit_test_addupgradebootentry.py b/repos/system_upgrade/el7toel8/actors/addupgradebootentry/tests/unit_test_addupgradebootentry.py -index bb89c9f..ccc53ae 100644 ---- a/repos/system_upgrade/el7toel8/actors/addupgradebootentry/tests/unit_test_addupgradebootentry.py -+++ b/repos/system_upgrade/el7toel8/actors/addupgradebootentry/tests/unit_test_addupgradebootentry.py -@@ -42,7 +42,7 @@ run_args_add = [ - '/usr/sbin/grubby', - '--add-kernel', '/abc', - '--initrd', '/def', -- '--title', 'RHEL-Upgrade-Initramfs', -+ '--title', 'Anolis-Upgrade-Initramfs', - '--copy-default', - '--make-default', - '--args', -diff --git a/repos/system_upgrade/el7toel8/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/do-upgrade.sh b/repos/system_upgrade/el7toel8/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/do-upgrade.sh -index 8729a5d..0b87498 100755 ---- a/repos/system_upgrade/el7toel8/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/do-upgrade.sh -+++ b/repos/system_upgrade/el7toel8/actors/commonleappdracutmodules/files/dracut/85sys-upgrade-redhat/do-upgrade.sh -@@ -70,6 +70,24 @@ do_upgrade() { - ## install new product id certificates - #chroot $NEWROOT /bin/sh -c 'mv -f /system-upgrade/*.pem /etc/pki/product/' - -+ if [ -d "/sys/firmware/efi/efivars/" ]; then -+ cp $NEWROOT/lib64/libefi* /lib64/ -+ cp $NEWROOT/lib64/libfdisk* /lib64/ -+ if ! $NEWROOT/usr/sbin/efibootmgr | grep -i "Anolis OS"; then -+ efi_device=$($NEWROOT/usr/sbin/fdisk -l -o Device,Type | grep EFI\ System | sed 's/ .*//') -+ if [ "${efi_device}" ]; then -+ efi_part=${efi_device:8} -+ efi_device=${efi_device::8} -+ if [ "$(uname -m)" == "aarch64" ]; then -+ efi_arch="aa64" -+ elif [ "$(uname -m)" == "x86_64" ]; then -+ efi_arch="x64" -+ fi -+ $NEWROOT/usr/sbin/efibootmgr -c -d ${efi_device} -p ${efi_part} -l "/EFI/anolis/shim${efi_arch}.efi" -L "Anolis OS" -+ fi -+ fi -+ fi -+ - # restore things twiddled by workarounds above. TODO: remove! - if [ -f /sys/fs/selinux/enforce ]; then - echo $enforce > /sys/fs/selinux/enforce --- -2.27.0 - diff --git a/0028-add-disablerepo-option-to-upgrade-kernel-to-RHCK.patch b/0028-add-disablerepo-option-to-upgrade-kernel-to-RHCK.patch deleted file mode 100644 index 4a5672d..0000000 --- a/0028-add-disablerepo-option-to-upgrade-kernel-to-RHCK.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ad08c0a1c09acdaa5d4999f1f0ae51da4f82e54f Mon Sep 17 00:00:00 2001 -From: mgb01105731 -Date: Fri, 9 Sep 2022 17:52:19 +0800 -Subject: [PATCH] add --disablerepo option to upgrade kernel to RHCK - ---- - .../libraries/scancustomrepofile.py | 18 +++++++++++------- - 1 file changed, 11 insertions(+), 7 deletions(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/scancustomrepofile/libraries/scancustomrepofile.py b/repos/system_upgrade/el7toel8/actors/scancustomrepofile/libraries/scancustomrepofile.py -index c294193..a5a30bd 100644 ---- a/repos/system_upgrade/el7toel8/actors/scancustomrepofile/libraries/scancustomrepofile.py -+++ b/repos/system_upgrade/el7toel8/actors/scancustomrepofile/libraries/scancustomrepofile.py -@@ -3,7 +3,7 @@ import os - from leapp.libraries.common import repofileutils - from leapp.libraries.stdlib import api - from leapp.models import CustomTargetRepository, CustomTargetRepositoryFile -- -+from leapp.libraries.common import config - - CUSTOM_REPO_PATH = "/etc/leapp/files/leapp_upgrade_repositories.repo" - -@@ -26,10 +26,14 @@ def process(): - if not repofile.data: - return - api.produce(CustomTargetRepositoryFile(file=CUSTOM_REPO_PATH)) -+ disablelist=[] -+ if config.get_env('LEAPP_DISABLE_REPOS'): -+ disablelist = [repoid for repoid in config.get_env('LEAPP_DISABLE_REPOS').split(',')] - for repo in repofile.data: -- api.produce(CustomTargetRepository( -- repoid=repo.repoid, -- name=repo.name, -- baseurl=repo.baseurl, -- enabled=repo.enabled, -- )) -+ if repo.enabled and repo.repoid not in disablelist: -+ api.produce(CustomTargetRepository( -+ repoid=repo.repoid, -+ name=repo.name, -+ baseurl=repo.baseurl, -+ enabled=repo.enabled, -+ )) --- -2.19.2 - diff --git a/0029-Service-configuration-remains-after-migration.patch b/0029-Service-configuration-remains-after-migration.patch deleted file mode 100644 index 8ff3ed8..0000000 --- a/0029-Service-configuration-remains-after-migration.patch +++ /dev/null @@ -1,255 +0,0 @@ -From 26581abc7eac1dae5bd07380d26703d4f1e0439a Mon Sep 17 00:00:00 2001 -From: Weisson -Date: Thu, 1 Sep 2022 13:16:55 +0800 -Subject: [PATCH] Service configuration should remain the same after migration. - ---- - .../serviceconfigurationcollector/actor.py | 27 +++++ - .../serviceconfigurationsynchronizer/actor.py | 102 ++++++++++++++++++ - .../models/configurationsynchronization.py | 7 ++ - .../tags/configurationcollectionphase.py | 5 + - .../tags/configurationsynchronizationphase.py | 5 + - .../topics/configurationsynchronization.py | 5 + - .../el7toel8/workflows/inplace_upgrade.py | 26 +++++ - 7 files changed, 177 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/serviceconfigurationcollector/actor.py - create mode 100644 repos/system_upgrade/el7toel8/actors/serviceconfigurationsynchronizer/actor.py - create mode 100644 repos/system_upgrade/el7toel8/models/configurationsynchronization.py - create mode 100644 repos/system_upgrade/el7toel8/tags/configurationcollectionphase.py - create mode 100644 repos/system_upgrade/el7toel8/tags/configurationsynchronizationphase.py - create mode 100644 repos/system_upgrade/el7toel8/topics/configurationsynchronization.py - -diff --git a/repos/system_upgrade/el7toel8/actors/serviceconfigurationcollector/actor.py b/repos/system_upgrade/el7toel8/actors/serviceconfigurationcollector/actor.py -new file mode 100644 -index 0000000..fbee732 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/serviceconfigurationcollector/actor.py -@@ -0,0 +1,27 @@ -+import subprocess -+import json -+ -+from leapp.actors import Actor -+from leapp.tags import ConfigurationCollectionPhaseTag, IPUWorkflowTag -+from leapp.models import ConfigurationSynchronization -+ -+ -+class ServiceConfigurationCollector(Actor): -+ """ -+ No documentation has been provided for the service_configuration_collector actor. -+ """ -+ -+ name = 'service_configuration_collector' -+ consumes = () -+ produces = (ConfigurationSynchronization, ) -+ tags = (ConfigurationCollectionPhaseTag, IPUWorkflowTag, ) -+ -+ def process(self): -+ self.log.info("Starting to backup service configurations.") -+ services_config_raw = subprocess.check_output("systemctl list-unit-files | egrep 'enabled|disabled'", shell=True).decode("utf-8").strip() -+ services_config = { -+ line.strip().split()[0]: line.strip().split()[1][:-1] -+ for line in services_config_raw.split('\n') -+ } -+ self.produce(ConfigurationSynchronization(services_configuration=json.dumps(services_config))) -+ -diff --git a/repos/system_upgrade/el7toel8/actors/serviceconfigurationsynchronizer/actor.py b/repos/system_upgrade/el7toel8/actors/serviceconfigurationsynchronizer/actor.py -new file mode 100644 -index 0000000..7856bea ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/serviceconfigurationsynchronizer/actor.py -@@ -0,0 +1,102 @@ -+import json -+import subprocess -+ -+from leapp.actors import Actor -+from leapp.tags import ConfigurationSynchronizationPhaseTag, IPUWorkflowTag -+from leapp.models import ConfigurationSynchronization -+ -+ -+class ServiceConfigurationSynchronizer(Actor): -+ """ -+ No documentation has been provided for the service_configuration_synchronizer actor. -+ """ -+ -+ name = 'service_configuration_synchronizer' -+ consumes = (ConfigurationSynchronization, ) -+ produces = () -+ tags = (IPUWorkflowTag, ConfigurationSynchronizationPhaseTag, ) -+ -+ def service_configuration_backup(self): -+ try: -+ self.log.info("backing up service configurations after migration.") -+ services_config_raw = str(subprocess.check_output("systemctl list-unit-files | egrep 'enabled |disabled ' | awk '{print $1,$2}'")).strip() -+ services_config = { -+ line.strip().split()[0]: line.strip().split()[1][:-1] -+ for line in services_config_raw.split('\n') -+ } -+ -+ return services_config -+ except Exception as e: -+ self.log.warning(" fail to backup service, ignore it. " + str(e)) -+ -+ return {} -+ -+ def do_config_services(self, config): -+ config_report = [] -+ for service, status in config.items(): -+ self.log.info("".join((service, " -> ", status))) -+ report = { -+ "service": service, -+ "old status": status, -+ "current status": status, -+ } -+ -+ try: -+ print("systemctl %s %s" % (status, service)) -+ output = str(subprocess.check_call("systemctl %s %s" % (status, service), shell=True)).strip() -+ report.update({ -+ "information": output, -+ "result": "succeed" -+ }) -+ -+ except Exception as e: -+ self.log.warning("fail to %s %s" % (status, service)) -+ -+ report.update({ -+ "information": str(e), -+ "result": "fail", -+ }) -+ -+ config_report += [report] -+ -+ return config_report -+ -+ def config_services(self, config, backup): -+ _config_report = self.do_config_services(config) -+ -+ config_report = [] -+ for line in _config_report: -+ if line["result"] == "fail": -+ line["current status"] = backup.get(line["service"] , "does not exist") -+ -+ config_report += [line] -+ -+ return config_report -+ -+ def service_configuration_restore(self, backup_configuration): -+ try: -+ self.log.info("Starting to roll back services configurations.") -+ self.do_config_services(backup_configuration) -+ -+ except Exception as e: -+ self.log.warning("fail to roll back services configurations: " + str(e)) -+ self.log.warning("default service configuration : " + str(backup_configuration)) -+ with open("/var/log/leapp/service-default.log", "w") as f: -+ json.dump(str(backup_configuration), f, indent=4) -+ -+ def process(self): -+ backup_configuratuon = self.service_configuration_backup() -+ -+ try: -+ self.log.info("Starting to synchronize services configurations.") -+ for configuration in self.consume(ConfigurationSynchronization): -+ services_configuration = json.loads(configuration.services_configuration) -+ config_report = self.config_services(services_configuration, backup_configuratuon) -+ -+ with open("/var/log/leapp/service-configuration-report.json", "w") as f: -+ json.dump(config_report, f, indent=4) -+ print("Service configuration output: /var/log/leapp/service-configuration-report.json") -+ -+ except Exception as e: -+ self.log.warning("fail to synchronize services configurations, rolling back. " + str(e)) -+ -diff --git a/repos/system_upgrade/el7toel8/models/configurationsynchronization.py b/repos/system_upgrade/el7toel8/models/configurationsynchronization.py -new file mode 100644 -index 0000000..349ac3d ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/models/configurationsynchronization.py -@@ -0,0 +1,7 @@ -+from leapp.models import Model, fields -+from leapp.topics import ConfigurationSynchronizationTopic -+ -+class ConfigurationSynchronization(Model): -+ topic = ConfigurationSynchronizationTopic -+ services_configuration = fields.Nullable(fields.String()) -+ -diff --git a/repos/system_upgrade/el7toel8/tags/configurationcollectionphase.py b/repos/system_upgrade/el7toel8/tags/configurationcollectionphase.py -new file mode 100644 -index 0000000..a24ec82 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/tags/configurationcollectionphase.py -@@ -0,0 +1,5 @@ -+from leapp.tags import Tag -+ -+ -+class ConfigurationCollectionPhaseTag(Tag): -+ name = 'configuration_collection_phase' -diff --git a/repos/system_upgrade/el7toel8/tags/configurationsynchronizationphase.py b/repos/system_upgrade/el7toel8/tags/configurationsynchronizationphase.py -new file mode 100644 -index 0000000..81610a8 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/tags/configurationsynchronizationphase.py -@@ -0,0 +1,5 @@ -+from leapp.tags import Tag -+ -+ -+class ConfigurationSynchronizationPhaseTag(Tag): -+ name = 'configuration_synchronization_phase' -diff --git a/repos/system_upgrade/el7toel8/topics/configurationsynchronization.py b/repos/system_upgrade/el7toel8/topics/configurationsynchronization.py -new file mode 100644 -index 0000000..8d01b38 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/topics/configurationsynchronization.py -@@ -0,0 +1,5 @@ -+from leapp.topics import Topic -+ -+ -+class ConfigurationSynchronizationTopic(Topic): -+ name = 'configuration_synchronization' -diff --git a/repos/system_upgrade/el7toel8/workflows/inplace_upgrade.py b/repos/system_upgrade/el7toel8/workflows/inplace_upgrade.py -index 8e48d8c..c0dd27e 100644 ---- a/repos/system_upgrade/el7toel8/workflows/inplace_upgrade.py -+++ b/repos/system_upgrade/el7toel8/workflows/inplace_upgrade.py -@@ -16,6 +16,19 @@ class IPUWorkflow(Workflow): - configuration = IPUConfig - description = """The IPU workflow takes care of an in-place upgrade (IPU) of RHEL 7 to Anolis 8.""" - -+ class ConfigurationCollectionPhase(Phase): -+ """ -+ This phase and ConfigurationSynchronizationPhase must appear in pairs to ensure the configuration -+ before and after migration remains as similar as possible. -+ -+ This part is configuration collection phase. -+ """ -+ name = "ConfigurationCollection" -+ filter = TagFilter(tags.ConfigurationCollectionPhaseTag) -+ policies = Policies(Policies.Errors.FailPhase, -+ Policies.Retry.Phase) -+ flags = Flags() -+ - class FactsCollectionPhase(Phase): - """ - Get information (facts) about the system (e.g. installed packages, configuration, ...). -@@ -210,6 +223,19 @@ class IPUWorkflow(Workflow): - Policies.Retry.Phase) - flags = Flags(restart_after_phase=True) - -+ class ConfigurationSynchronizationPhase(Phase): -+ """ -+ This phase and ConfigurationCollectionPhase must appear in pairs to ensure the configuration -+ before and after migration remains as similar as possible. -+ -+ This part is configuration Synchronization phase. -+ """ -+ name = "ConfigurationSynchronization" -+ filter = TagFilter(tags.ConfigurationSynchronizationPhaseTag) -+ policies = Policies(Policies.Errors.FailPhase, -+ Policies.Retry.Phase) -+ flags = Flags() -+ - class FirstBootPhase(Phase): - """Actions to be done right after booting into the upgraded system.""" - --- -2.31.1 - -- Gitee From 24e6b90fe6365be48e507ecaa45e7f54601aaa9c Mon Sep 17 00:00:00 2001 From: wangzhe Date: Thu, 25 May 2023 19:22:00 +0800 Subject: [PATCH 3/5] switch from rpm tree to source tree, remove 0010~0019 patch Signed-off-by: wangzhe --- 0010-add-checkaudit.patch | 94 ------------- 0011-add-checkmandb.patch | 93 ------------- 0012-add-checkpkgforupgrade.patch | 128 ------------------ 0013-add-checksystemd.patch | 110 --------------- 0014-add-checkglibc.patch | 97 ------------- ....cfg-for-uefi-and-keep-some-packages.patch | 101 -------------- ...-key-of-aarch64-kernel-for-centos7.x.patch | 27 ---- 0017-change-redhat-to-anolis.patch | 27 ---- 0018-add-checksysvinittools.patch | 92 ------------- 0019-add-checkdocker.patch | 93 ------------- 10 files changed, 862 deletions(-) delete mode 100644 0010-add-checkaudit.patch delete mode 100644 0011-add-checkmandb.patch delete mode 100644 0012-add-checkpkgforupgrade.patch delete mode 100644 0013-add-checksystemd.patch delete mode 100644 0014-add-checkglibc.patch delete mode 100644 0015-update-grub.cfg-for-uefi-and-keep-some-packages.patch delete mode 100644 0016-add-key-of-aarch64-kernel-for-centos7.x.patch delete mode 100644 0017-change-redhat-to-anolis.patch delete mode 100644 0018-add-checksysvinittools.patch delete mode 100644 0019-add-checkdocker.patch diff --git a/0010-add-checkaudit.patch b/0010-add-checkaudit.patch deleted file mode 100644 index 2631611..0000000 --- a/0010-add-checkaudit.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 1f9673596add1eb7c90d5b103bb238e2d1a0cfd7 Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Sat, 26 Jun 2021 12:55:44 +0800 -Subject: [PATCH 2/3] add checkaudit - -audispd releated files are moved from audit to audispd-plugins, -and audispd-plugins is not installed by default. - -Signed-off-by: Chunmei Xu ---- - .../el7toel8/actors/checkaudit/actor.py | 30 +++++++++++++++++ - .../tests/component_test_checkaudit.py | 33 +++++++++++++++++++ - 2 files changed, 63 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/checkaudit/actor.py - create mode 100644 repos/system_upgrade/el7toel8/actors/checkaudit/tests/component_test_checkaudit.py - -diff --git a/repos/system_upgrade/el7toel8/actors/checkaudit/actor.py b/repos/system_upgrade/el7toel8/actors/checkaudit/actor.py -new file mode 100644 -index 0000000..b778f8a ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkaudit/actor.py -@@ -0,0 +1,30 @@ -+from leapp.actors import Actor -+from leapp.libraries.common.rpms import has_package -+from leapp.models import InstalledRedHatSignedRPM -+from leapp.reporting import Report, create_report -+from leapp import reporting -+from leapp.tags import ChecksPhaseTag, IPUWorkflowTag -+ -+ -+class CheckAudit(Actor): -+ """ -+ Check if audit is installed. If yes, write information about audit changes. -+ """ -+ -+ name = 'checkaudit' -+ consumes = (InstalledRedHatSignedRPM,) -+ produces = (Report,) -+ tags = (ChecksPhaseTag, IPUWorkflowTag) -+ -+ def process(self): -+ if has_package(InstalledRedHatSignedRPM, 'audit'): -+ create_report([ -+ reporting.Title('audispd is moved from audit to audispd-plugins'), -+ reporting.Summary( -+ 'In Anolis8, audispd related files is moved to audispd-plugins package, ' -+ 'and audispd-plugins is not installed by default, if you want to use audispd, ' -+ 'please install audispd-plugins.' -+ ), -+ reporting.Severity(reporting.Severity.LOW), -+ reporting.RelatedResource('package', 'audit') -+ ]) -diff --git a/repos/system_upgrade/el7toel8/actors/checkaudit/tests/component_test_checkaudit.py b/repos/system_upgrade/el7toel8/actors/checkaudit/tests/component_test_checkaudit.py -new file mode 100644 -index 0000000..5c6b4c3 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkaudit/tests/component_test_checkaudit.py -@@ -0,0 +1,33 @@ -+from leapp.snactor.fixture import current_actor_context -+from leapp.models import InstalledRedHatSignedRPM, RPM -+from leapp.reporting import Report -+ -+RH_PACKAGER = 'Red Hat, Inc. ' -+ -+ -+def create_modulesfacts(installed_rpm): -+ return InstalledRedHatSignedRPM(items=installed_rpm) -+ -+ -+def test_actor_with_audit_package(current_actor_context): -+ with_sysstat = [ -+ RPM(name='audit', version='10.1.5', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=with_audit)) -+ current_actor_context.run() -+ assert current_actor_context.consume(Report) -+ -+ -+def test_actor_without_audit_package(current_actor_context): -+ without_audit = [ -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='sed', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=without_audit)) -+ current_actor_context.run() -+ assert not current_actor_context.consume(Report) --- -2.29.2 - diff --git a/0011-add-checkmandb.patch b/0011-add-checkmandb.patch deleted file mode 100644 index 24d03d6..0000000 --- a/0011-add-checkmandb.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 23b4ef9f9d8abfb0d425814056f34d77323bd49a Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Sat, 26 Jun 2021 13:03:48 +0800 -Subject: [PATCH 3/3] add checkmandb - -man-db.cron is moved from man-db to man-db-cron package. - -Signed-off-by: Chunmei Xu ---- - .../el7toel8/actors/checkmandb/actor.py | 30 +++++++++++++++++ - .../tests/component_test_checkmandb.py | 33 +++++++++++++++++++ - 2 files changed, 63 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/checkmandb/actor.py - create mode 100644 repos/system_upgrade/el7toel8/actors/checkmandb/tests/component_test_checkmandb.py - -diff --git a/repos/system_upgrade/el7toel8/actors/checkmandb/actor.py b/repos/system_upgrade/el7toel8/actors/checkmandb/actor.py -new file mode 100644 -index 0000000..97c1a10 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkmandb/actor.py -@@ -0,0 +1,30 @@ -+from leapp.actors import Actor -+from leapp.libraries.common.rpms import has_package -+from leapp.models import InstalledRedHatSignedRPM -+from leapp.reporting import Report, create_report -+from leapp import reporting -+from leapp.tags import ChecksPhaseTag, IPUWorkflowTag -+ -+ -+class CheckMandb(Actor): -+ """ -+ Check if mandb is installed. If yes, write information about important changes. -+ """ -+ -+ name = 'checkmandb' -+ consumes = (InstalledRedHatSignedRPM,) -+ produces = (Report,) -+ tags = (ChecksPhaseTag, IPUWorkflowTag) -+ -+ def process(self): -+ if has_package(InstalledRedHatSignedRPM, 'man-db'): -+ create_report([ -+ reporting.Title('man-db.cron is not enabled by default'), -+ reporting.Summary( -+ 'Anolis8 move /etc/cron.d/man-db.cron from man-db to man-db-cron, ' -+ 'man-db.cron is used to periodic update of man-db cache, ' -+ 'if you need this feature, please instal man-db-cron.' -+ ), -+ reporting.Severity(reporting.Severity.LOW), -+ reporting.RelatedResource('package', 'man-db') -+ ]) -diff --git a/repos/system_upgrade/el7toel8/actors/checkmandb/tests/component_test_checkmandb.py b/repos/system_upgrade/el7toel8/actors/checkmandb/tests/component_test_checkmandb.py -new file mode 100644 -index 0000000..fa3e536 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkmandb/tests/component_test_checkmandb.py -@@ -0,0 +1,33 @@ -+from leapp.snactor.fixture import current_actor_context -+from leapp.models import InstalledRedHatSignedRPM, RPM -+from leapp.reporting import Report -+ -+RH_PACKAGER = 'Red Hat, Inc. ' -+ -+ -+def create_modulesfacts(installed_rpm): -+ return InstalledRedHatSignedRPM(items=installed_rpm) -+ -+ -+def test_actor_with_mandb_package(current_actor_context): -+ with_mandb = [ -+ RPM(name='man-db', version='1.0.2', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=with_mandb)) -+ current_actor_context.run() -+ assert current_actor_context.consume(Report) -+ -+ -+def test_actor_without_mandb_package(current_actor_context): -+ without_mandb = [ -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='sed', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=without_mandb)) -+ current_actor_context.run() -+ assert not current_actor_context.consume(Report) --- -2.29.2 - diff --git a/0012-add-checkpkgforupgrade.patch b/0012-add-checkpkgforupgrade.patch deleted file mode 100644 index 484eeaa..0000000 --- a/0012-add-checkpkgforupgrade.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 9fdaf606a707decc161c58bd6e44a9ce678c2fc0 Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Wed, 7 Jul 2021 19:26:57 +0800 -Subject: [PATCH] add checkpkgforupgrade - -check grub2 version for upgrade to avoid reboot to minimal grub shell - -Signed-off-by: Chunmei Xu ---- - .../actors/checkpkgforupgrade/actor.py | 65 +++++++++++++++++++ - .../component_test_checkpkgforupgrade.py | 33 ++++++++++ - 2 files changed, 98 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py - create mode 100644 repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/tests/component_test_checkpkgforupgrade.py - -diff --git a/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py b/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py -new file mode 100644 -index 0000000..9e42030 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/actor.py -@@ -0,0 +1,65 @@ -+from leapp.actors import Actor -+from leapp.libraries.common.rpms import has_package -+from leapp.models import InstalledRedHatSignedRPM -+from leapp.reporting import Report, create_report -+from leapp import reporting -+from leapp.tags import ChecksPhaseTag, IPUWorkflowTag -+from leapp.libraries.stdlib import run -+ -+ -+class CheckPackagesForUpgrade(Actor): -+ """ -+ Check version of some packages that may have impact on upgrade process -+ """ -+ -+ name = 'checkpkgforupgrade' -+ consumes = (InstalledRedHatSignedRPM,) -+ produces = (Report,) -+ tags = (ChecksPhaseTag, IPUWorkflowTag) -+ -+ def get_releasever_of_rpm(self, pkg_name): -+ rel_ver = run(['rpm', '-q', pkg_name, '--qf', '%{RELEASE}'], split=False)['stdout'] -+ return rel_ver -+ -+ def compare_version(self, ver1, ver2): -+ """ -+ ver1 < ver2, return -1 -+ ver1 = ver2, return 0 -+ ver1 > ver2, return 1 -+ """ -+ list1 = str(ver1).split(".") -+ list2 = str(ver2).split(".") -+ if len(list1) > len(list2): -+ length = len(list2) -+ else: -+ length = len(list1) -+ -+ for i in range(0, length): -+ if list1[i] > list2[i]: -+ return 1 -+ elif list1[i] < list2[i]: -+ return -1 -+ if len(list1) > len(list2): -+ return 1 -+ elif len(list1) < len(list2): -+ return -1 -+ else: -+ return 0 -+ -+ -+ def process(self): -+ if has_package(InstalledRedHatSignedRPM, 'grub2'): -+ grub2_version = self.get_releasever_of_rpm('grub2') -+ if self.compare_version(grub2_version, '0.64') < 0: -+ commands = [['yum', '-y', 'update', 'grub2']] -+ create_report([ -+ reporting.Title('grub2 version is too low for system upgrade'), -+ reporting.Summary( -+ 'grub2 version must be upgrade to version >= 2.02-0.64, ' -+ 'otherwise system upgrade will get failed after reboot.' -+ ), -+ reporting.Severity(reporting.Severity.HIGH), -+ reporting.Flags([reporting.Flags.INHIBITOR]), -+ reporting.Remediation(commands=commands), -+ reporting.RelatedResource('package', 'grub2'), -+ ]) -diff --git a/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/tests/component_test_checkpkgforupgrade.py b/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/tests/component_test_checkpkgforupgrade.py -new file mode 100644 -index 0000000..8532b8a ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkpkgforupgrade/tests/component_test_checkpkgforupgrade.py -@@ -0,0 +1,33 @@ -+from leapp.snactor.fixture import current_actor_context -+from leapp.models import InstalledRedHatSignedRPM, RPM -+from leapp.reporting import Report -+ -+RH_PACKAGER = 'Red Hat, Inc. ' -+ -+ -+def create_modulesfacts(installed_rpm): -+ return InstalledRedHatSignedRPM(items=installed_rpm) -+ -+ -+def test_actor_with_important_package(current_actor_context): -+ with_important = [ -+ RPM(name='glib2', version='2.46.2', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='x86_64', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='grub2', version='2.02', release='0.44.el7.centos', epoch='1', packager=RH_PACKAGER, arch='x86_64', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=with_important)) -+ current_actor_context.run() -+ assert current_actor_context.consume(Report) -+ -+ -+def test_actor_without_important_package(current_actor_context): -+ without_important = [ -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='sed', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=without_important)) -+ current_actor_context.run() -+ assert not current_actor_context.consume(Report) --- -2.29.2 - diff --git a/0013-add-checksystemd.patch b/0013-add-checksystemd.patch deleted file mode 100644 index bb5d27a..0000000 --- a/0013-add-checksystemd.patch +++ /dev/null @@ -1,110 +0,0 @@ -From a6eeafc18dc94889509eb372c1bfde9e921ffdc7 Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Mon, 26 Jul 2021 16:18:37 +0800 -Subject: [PATCH] add checksystemd - -show important changes of systemd related config files - -Signed-off-by: Chunmei Xu ---- - .../el7toel8/actors/checksystemd/actor.py | 47 +++++++++++++++++++ - .../tests/component_test_checksystemd.py | 33 +++++++++++++ - 2 files changed, 80 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/checksystemd/actor.py - create mode 100644 repos/system_upgrade/el7toel8/actors/checksystemd/tests/component_test_checksystemd.py - -diff --git a/repos/system_upgrade/el7toel8/actors/checksystemd/actor.py b/repos/system_upgrade/el7toel8/actors/checksystemd/actor.py -new file mode 100644 -index 0000000..919e5fb ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checksystemd/actor.py -@@ -0,0 +1,47 @@ -+from leapp.actors import Actor -+from leapp.libraries.common.rpms import has_package -+from leapp.models import InstalledRedHatSignedRPM -+from leapp.reporting import Report, create_report -+from leapp import reporting -+from leapp.tags import ChecksPhaseTag, IPUWorkflowTag -+ -+ -+class CheckSystemd(Actor): -+ """ -+ Show important changes of systemd config -+ """ -+ -+ name = 'checksystemd' -+ consumes = (InstalledRedHatSignedRPM,) -+ produces = (Report,) -+ tags = (ChecksPhaseTag, IPUWorkflowTag) -+ -+ def process(self): -+ if has_package(InstalledRedHatSignedRPM, 'systemd'): -+ create_report([ -+ reporting.Title('systemd related configs have importand changes in new version'), -+ reporting.Summary( -+ '/etc/systemd/journal.conf import two options: SystemMaxFiles and RuntimeMaxFiles. ' -+ 'These two options are used to limit the count of journal files, default is 100. ' -+ 'So in Anolis8, the default journal files will be 100, and the journal files older' -+ 'than 100 will be removed, thus system logs will be lost when os has large number of logs.\n' -+ '/etc/systemd/journal.conf move option ForwordToSyslog from yes to no by default, ' -+ 'this means that logs recevied by journal are no longer forwarded to syslog by default, ' -+ 'Anolis8 use rsyslog by default and rsyslog reads directly journal data.\n' -+ '/etc/systemd/system.conf rename CrashChVT to CrashChangeVT, the old options are still compatible, ' -+ 'but the valut meaning of CrashChangeVT has changed. ' -+ 'Centos7 accepts int type parameters, ' -+ 'where a positive number represents the virtual terminal corresponding to this number when systemd crashes, such as /dev/tty1, ' -+ 'and a zero or negative number indicates that systemd does not switch virtual terminals when systemd crashes. ' -+ 'In anolis8, it accepts positive or bool type parameters, but it is still compatible with the old parameter types. ' -+ 'A positive number means that systemd will switch to the virtual terminal corresponding to this number when a crash occurs. ' -+ 'A negative number /0/no/n/false/f/off means that systemd will not switch the virtual terminal when a crash occurs. ' -+ 'The yes/y/true/t/on parameter represents the virtual terminal that switches to the kernel log printing when systemd crashes. ' -+ 'The value of this parameter changes from 1 to no before and after the switch, indicating that the terminal will not be switched when systemd crashes.\n' -+ '/etc/systemd/system.conf configuration option DefaultTasksMax changes: ' -+ 'There is no limit by default in centos7. ' -+ 'In anolis8.2, the number of threads that each service can have is min (kernel.pid_max, kernel.threads-max, pids.max of root-cgroup) * 80% by default.\n' -+ ), -+ reporting.Severity(reporting.Severity.HIGH), -+ reporting.RelatedResource('package', 'systemd') -+ ]) -diff --git a/repos/system_upgrade/el7toel8/actors/checksystemd/tests/component_test_checksystemd.py b/repos/system_upgrade/el7toel8/actors/checksystemd/tests/component_test_checksystemd.py -new file mode 100644 -index 0000000..81e2381 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checksystemd/tests/component_test_checksystemd.py -@@ -0,0 +1,33 @@ -+from leapp.snactor.fixture import current_actor_context -+from leapp.models import InstalledRedHatSignedRPM, RPM -+from leapp.reporting import Report -+ -+RH_PACKAGER = 'Red Hat, Inc. ' -+ -+ -+def create_modulesfacts(installed_rpm): -+ return InstalledRedHatSignedRPM(items=installed_rpm) -+ -+ -+def test_actor_with_systemd_package(current_actor_context): -+ with_systemd = [ -+ RPM(name='systemd', version='1.0.2', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=with_systemd)) -+ current_actor_context.run() -+ assert current_actor_context.consume(Report) -+ -+ -+def test_actor_without_systemd_package(current_actor_context): -+ without_systemd = [ -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='sed', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=without_systemd)) -+ current_actor_context.run() -+ assert not current_actor_context.consume(Report) --- -2.29.2 - diff --git a/0014-add-checkglibc.patch b/0014-add-checkglibc.patch deleted file mode 100644 index f031846..0000000 --- a/0014-add-checkglibc.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 09faa4508f1861e2845d8fd83f8700c061e12017 Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Mon, 26 Jul 2021 19:32:16 +0800 -Subject: [PATCH] add checkglibc - -show changes about nis module and /etc/nsswitch.conf - -Signed-off-by: Chunmei Xu ---- - .../el7toel8/actors/checkglibc/actor.py | 34 +++++++++++++++++++ - .../tests/component_test_checkglibc.py | 33 ++++++++++++++++++ - 2 files changed, 67 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/checkglibc/actor.py - create mode 100644 repos/system_upgrade/el7toel8/actors/checkglibc/tests/component_test_checkglibc.py - -diff --git a/repos/system_upgrade/el7toel8/actors/checkglibc/actor.py b/repos/system_upgrade/el7toel8/actors/checkglibc/actor.py -new file mode 100644 -index 0000000..145602f ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkglibc/actor.py -@@ -0,0 +1,34 @@ -+from leapp.actors import Actor -+from leapp.libraries.common.rpms import has_package -+from leapp.models import InstalledRedHatSignedRPM -+from leapp.reporting import Report, create_report -+from leapp import reporting -+from leapp.tags import ChecksPhaseTag, IPUWorkflowTag -+ -+ -+class CheckGlibc(Actor): -+ """ -+ Show important changes of glibc -+ """ -+ -+ name = 'checkglibc' -+ consumes = (InstalledRedHatSignedRPM,) -+ produces = (Report,) -+ tags = (ChecksPhaseTag, IPUWorkflowTag) -+ -+ def process(self): -+ if has_package(InstalledRedHatSignedRPM, 'glibc'): -+ create_report([ -+ reporting.Title('Some important changes about glibc'), -+ reporting.Summary( -+ 'The GLIBC version of Anolis8 is 2.28. ' -+ 'This version no longer supports nss related modules, ' -+ 'no longer providing libnss_nis.so, libnss_nisplus.so. \n' -+ '/etc/nsswitch.conf deletes all configurations related to nis. ' -+ 'The fast cache mechanism provided by the sssd can enhance the parsing performance of user and groups, ' -+ '/etc/nsswitch.conf defaults to set the preferences for passwd and group for sss.\n' -+ 'All code that relies and uses the nis module requires rectification, you can use tirpc instead.' -+ ), -+ reporting.Severity(reporting.Severity.HIGH), -+ reporting.RelatedResource('package', 'glibc') -+ ]) -diff --git a/repos/system_upgrade/el7toel8/actors/checkglibc/tests/component_test_checkglibc.py b/repos/system_upgrade/el7toel8/actors/checkglibc/tests/component_test_checkglibc.py -new file mode 100644 -index 0000000..83780d8 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkglibc/tests/component_test_checkglibc.py -@@ -0,0 +1,33 @@ -+from leapp.snactor.fixture import current_actor_context -+from leapp.models import InstalledRedHatSignedRPM, RPM -+from leapp.reporting import Report -+ -+RH_PACKAGER = 'Red Hat, Inc. ' -+ -+ -+def create_modulesfacts(installed_rpm): -+ return InstalledRedHatSignedRPM(items=installed_rpm) -+ -+ -+def test_actor_with_glibc_package(current_actor_context): -+ with_glibc = [ -+ RPM(name='glibc', version='2.28', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=with_glibc)) -+ current_actor_context.run() -+ assert current_actor_context.consume(Report) -+ -+ -+def test_actor_without_glibc_package(current_actor_context): -+ without_glibc = [ -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='sed', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=without_glibc)) -+ current_actor_context.run() -+ assert not current_actor_context.consume(Report) --- -2.29.2 - diff --git a/0015-update-grub.cfg-for-uefi-and-keep-some-packages.patch b/0015-update-grub.cfg-for-uefi-and-keep-some-packages.patch deleted file mode 100644 index c45470f..0000000 --- a/0015-update-grub.cfg-for-uefi-and-keep-some-packages.patch +++ /dev/null @@ -1,101 +0,0 @@ -From abbd55961198881782c8d216530fb7e1408ed4d5 Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Sat, 31 Jul 2021 01:53:55 +0800 -Subject: [PATCH] update grub.cfg for uefi and keep some packages - -Signed-off-by: Chunmei Xu ---- - etc/leapp/transaction/to_keep | 2 ++ - .../actors/biosdevname/libraries/biosdevname.py | 13 ------------- - .../actors/efibootorderfix/finalization/actor.py | 2 +- - .../actors/efibootorderfix/interim/actor.py | 2 +- - .../el7toel8/libraries/efi_reboot_fix.py | 5 ++++- - 5 files changed, 8 insertions(+), 16 deletions(-) - -diff --git a/etc/leapp/transaction/to_keep b/etc/leapp/transaction/to_keep -index 19526e9..bebe417 100644 ---- a/etc/leapp/transaction/to_keep -+++ b/etc/leapp/transaction/to_keep -@@ -5,3 +5,5 @@ python2-leapp - python3-leapp - leapp-repository - snactor -+python-pyudev -+python-enum34 -diff --git a/repos/system_upgrade/el7toel8/actors/biosdevname/libraries/biosdevname.py b/repos/system_upgrade/el7toel8/actors/biosdevname/libraries/biosdevname.py -index d85a776..bbf3373 100644 ---- a/repos/system_upgrade/el7toel8/actors/biosdevname/libraries/biosdevname.py -+++ b/repos/system_upgrade/el7toel8/actors/biosdevname/libraries/biosdevname.py -@@ -1,6 +1,5 @@ - import re - --import pyudev - - from leapp.exceptions import StopActorExecutionError - from leapp.libraries.stdlib import api -@@ -15,16 +14,6 @@ def is_biosdevname_disabled(): - return False - - --def is_vendor_dell(): -- context = pyudev.Context() -- -- # There should be only one dmi/id device -- for dev in pyudev.Enumerator(context).match_subsystem('dmi').match_sys_name('id'): -- vendor = dev.attributes.get('sys_vendor') -- return re.search('Dell.*', str(vendor)) is not None -- return False -- -- - def all_interfaces_biosdevname(interfaces): - # Biosdevname supports two naming schemes - emx = re.compile('em[0-9]+') -@@ -53,5 +42,3 @@ def check_biosdevname(): - details={'details': 'No PersistentNetNamesFacts message found.'}, - ) - -- if is_vendor_dell() and all_interfaces_biosdevname(net_names_facts.interfaces): -- enable_biosdevname() -diff --git a/repos/system_upgrade/el7toel8/actors/efibootorderfix/finalization/actor.py b/repos/system_upgrade/el7toel8/actors/efibootorderfix/finalization/actor.py -index f42909f..97e0df9 100644 ---- a/repos/system_upgrade/el7toel8/actors/efibootorderfix/finalization/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/efibootorderfix/finalization/actor.py -@@ -14,4 +14,4 @@ class EfiFinalizationFix(Actor): - tags = (FinalizationPhaseTag, IPUWorkflowTag) - - def process(self): -- efi_reboot_fix.maybe_emit_updated_boot_entry() -+ efi_reboot_fix.maybe_emit_updated_boot_entry(True) -diff --git a/repos/system_upgrade/el7toel8/actors/efibootorderfix/interim/actor.py b/repos/system_upgrade/el7toel8/actors/efibootorderfix/interim/actor.py -index 1153fa7..567cd1e 100644 ---- a/repos/system_upgrade/el7toel8/actors/efibootorderfix/interim/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/efibootorderfix/interim/actor.py -@@ -14,4 +14,4 @@ class EfiInterimFix(Actor): - tags = (InterimPreparationPhaseTag, IPUWorkflowTag) - - def process(self): -- efi_reboot_fix.maybe_emit_updated_boot_entry() -+ efi_reboot_fix.maybe_emit_updated_boot_entry(False) -diff --git a/repos/system_upgrade/el7toel8/libraries/efi_reboot_fix.py b/repos/system_upgrade/el7toel8/libraries/efi_reboot_fix.py -index e9cb7ea..4dc5495 100644 ---- a/repos/system_upgrade/el7toel8/libraries/efi_reboot_fix.py -+++ b/repos/system_upgrade/el7toel8/libraries/efi_reboot_fix.py -@@ -24,7 +24,7 @@ def get_next_boot_match(string): - return captured_groups['boot_next'] - - --def maybe_emit_updated_boot_entry(): -+def maybe_emit_updated_boot_entry(is_final): - if not os.path.exists('/sbin/efibootmgr'): - return - -@@ -46,3 +46,6 @@ def maybe_emit_updated_boot_entry(): - if current_boot and not next_boot: - # We set BootNext to CurrentBoot only if BootNext wasn't previously set - run(['/sbin/efibootmgr', '-n', current_boot]) -+ -+ if is_final is True: -+ run(['cp', '/boot/efi/EFI/centos/grub.cfg', '/boot/efi/EFI/anolis/grub.cfg']) --- -2.29.2 - diff --git a/0016-add-key-of-aarch64-kernel-for-centos7.x.patch b/0016-add-key-of-aarch64-kernel-for-centos7.x.patch deleted file mode 100644 index 02694d9..0000000 --- a/0016-add-key-of-aarch64-kernel-for-centos7.x.patch +++ /dev/null @@ -1,27 +0,0 @@ -From eb223f8145729f7ae9642a17da99ce6fd6b0ce82 Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Mon, 2 Aug 2021 19:10:34 +0800 -Subject: [PATCH] add key of aarch64 kernel for centos7.x - -Signed-off-by: Chunmei Xu ---- - .../el7toel8/actors/redhatsignedrpmscanner/actor.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/redhatsignedrpmscanner/actor.py b/repos/system_upgrade/el7toel8/actors/redhatsignedrpmscanner/actor.py -index d7565f0..0e4314a 100644 ---- a/repos/system_upgrade/el7toel8/actors/redhatsignedrpmscanner/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/redhatsignedrpmscanner/actor.py -@@ -26,7 +26,8 @@ class RedHatSignedRpmScanner(Actor): - '938a80caf21541eb', - 'fd372689897da07a', - '45689c882fa658e0', -- '24c6a8a7f4a80eb5'] -+ '24c6a8a7f4a80eb5', -+ '6c7cb6ef305d49d6'] - - signed_pkgs = InstalledRedHatSignedRPM() - unsigned_pkgs = InstalledUnsignedRPM() --- -2.29.2 - diff --git a/0017-change-redhat-to-anolis.patch b/0017-change-redhat-to-anolis.patch deleted file mode 100644 index 24228d5..0000000 --- a/0017-change-redhat-to-anolis.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3f261ceea1f3c7538bde599a347e51b786a42609 Mon Sep 17 00:00:00 2001 -From: qhw01063182 -Date: Fri, 27 Aug 2021 09:41:17 +0800 -Subject: [PATCH] change redhat to anolis - ---- - .../actors/peseventsscanner/libraries/peseventsscanner.py | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/peseventsscanner/libraries/peseventsscanner.py b/repos/system_upgrade/el7toel8/actors/peseventsscanner/libraries/peseventsscanner.py -index 858608d..455bbd4 100644 ---- a/repos/system_upgrade/el7toel8/actors/peseventsscanner/libraries/peseventsscanner.py -+++ b/repos/system_upgrade/el7toel8/actors/peseventsscanner/libraries/peseventsscanner.py -@@ -523,8 +523,8 @@ def map_repositories(packages): - message='packages may not be installed or upgraded due to repositories unknown to leapp:', - package_repo_pairs=pkg_with_repo_without_mapping, - remediation=( -- "Please file a bug in http://bugzilla.redhat.com/ for leapp-repository component of " -- "the Red Hat Enterprise Linux 7 product." -+ "Please file a bug in https://bugs.openanolis.cn/ for leapp-repository component of " -+ "the Anolis product." - ), - ) - --- -2.29.2 - diff --git a/0018-add-checksysvinittools.patch b/0018-add-checksysvinittools.patch deleted file mode 100644 index 98cc811..0000000 --- a/0018-add-checksysvinittools.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 3770a48fa85a39b89438738b63086b31741f913a Mon Sep 17 00:00:00 2001 -From: zhoulong -Date: Wed, 13 Oct 2021 10:31:36 +0800 -Subject: [PATCH 1/4] add checksysvinittools - ---- - .../actors/checksysvinittools/actor.py | 32 ++++++++++++++++++ - .../component_test_checksysvinittools.py | 33 +++++++++++++++++++ - 2 files changed, 65 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/checksysvinittools/actor.py - create mode 100644 repos/system_upgrade/el7toel8/actors/checksysvinittools/tests/component_test_checksysvinittools.py - -diff --git a/repos/system_upgrade/el7toel8/actors/checksysvinittools/actor.py b/repos/system_upgrade/el7toel8/actors/checksysvinittools/actor.py -new file mode 100644 -index 0000000..6d7be40 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checksysvinittools/actor.py -@@ -0,0 +1,32 @@ -+from leapp.actors import Actor -+from leapp.libraries.common.rpms import has_package -+from leapp.models import InstalledRedHatSignedRPM -+from leapp.reporting import Report, create_report -+from leapp import reporting -+from leapp.tags import ChecksPhaseTag, IPUWorkflowTag -+ -+ -+class CheckSysvinittools(Actor): -+ """ -+ Check if sysvinit-tools is installed. If yes, write information about important changes. -+ """ -+ -+ name = 'checksysvinittools' -+ consumes = (InstalledRedHatSignedRPM,) -+ produces = (Report,) -+ tags = (ChecksPhaseTag, IPUWorkflowTag) -+ -+ def process(self): -+ if has_package(InstalledRedHatSignedRPM, 'sysvinit-tools'): -+ create_report([ -+ reporting.Title('sysvinit-tools is replaced by util-linux and procps-ng'), -+ reporting.Summary( -+ 'In Anolis 8, sysvinit-tools is removed, sysvinit-tools contains the following commands: last, lastb, mesg, wall, pidof and killall5. ' -+ 'In Anolis 8 system, last, lastb, mesg and wall are provided by util-linux, pidof is provided by procps-ng.\n' -+ 'Killall5 is a systemV command, the Centos 7 / Centos 8 are now based on systemd. ' -+ 'In addition, pidof provided by sysvinit-tools is actually a soft link to killall5. In Anolis 8, pidof is provided by procps-ng instead. ' -+ 'So, sysvinit-tools in Anolis 8 is replaced by util-linux and procps-ng. ' -+ ), -+ reporting.Severity(reporting.Severity.LOW), -+ reporting.RelatedResource('package', 'sysvinit-tools') -+ ]) -diff --git a/repos/system_upgrade/el7toel8/actors/checksysvinittools/tests/component_test_checksysvinittools.py b/repos/system_upgrade/el7toel8/actors/checksysvinittools/tests/component_test_checksysvinittools.py -new file mode 100644 -index 0000000..c2a6134 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checksysvinittools/tests/component_test_checksysvinittools.py -@@ -0,0 +1,33 @@ -+from leapp.snactor.fixture import current_actor_context -+from leapp.models import InstalledRedHatSignedRPM, RPM -+from leapp.reporting import Report -+ -+RH_PACKAGER = 'Red Hat, Inc. ' -+ -+ -+def create_modulesfacts(installed_rpm): -+ return InstalledRedHatSignedRPM(items=installed_rpm) -+ -+ -+def test_actor_with_audit_package(current_actor_context): -+ with_sysvinittools = [ -+ RPM(name='sysvinit-tools', version='2.28', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=with_sysvinittools)) -+ current_actor_context.run() -+ assert current_actor_context.consume(Report) -+ -+ -+def test_actor_without_sysvinittools_package(current_actor_context): -+ without_sysvinittools = [ -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='sed', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=without_sysvinittools)) -+ current_actor_context.run() -+ assert not current_actor_context.consume(Report) --- -2.19.1.6.gb485710b - diff --git a/0019-add-checkdocker.patch b/0019-add-checkdocker.patch deleted file mode 100644 index 76ab029..0000000 --- a/0019-add-checkdocker.patch +++ /dev/null @@ -1,93 +0,0 @@ -From e06e9d9c2dffc3368eff78092d81c59f6267247f Mon Sep 17 00:00:00 2001 -From: mgb01105731 -Date: Thu, 14 Oct 2021 17:35:18 +0800 -Subject: [PATCH 2/4] add checkdocker - ---- - .../el7toel8/actors/checkdocker/actor.py | 32 +++++++++++++++++ - .../tests/component_test_checkdocker.py | 34 +++++++++++++++++++ - 2 files changed, 66 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/checkdocker/actor.py - create mode 100644 repos/system_upgrade/el7toel8/actors/checkdocker/tests/component_test_checkdocker.py - -diff --git a/repos/system_upgrade/el7toel8/actors/checkdocker/actor.py b/repos/system_upgrade/el7toel8/actors/checkdocker/actor.py -new file mode 100644 -index 0000000..d8c2a1e ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkdocker/actor.py -@@ -0,0 +1,32 @@ -+from leapp.actors import Actor -+from leapp.libraries.common.rpms import has_package -+from leapp.models import InstalledRedHatSignedRPM -+from leapp.reporting import Report, create_report -+from leapp import reporting -+from leapp.tags import ChecksPhaseTag, IPUWorkflowTag -+ -+ -+class CheckDocker(Actor): -+ """ -+ Check if docker is installed. If yes, write information about important changes. -+ """ -+ -+ name = 'checkdocker' -+ consumes = (InstalledRedHatSignedRPM,) -+ produces = (Report,) -+ tags = (ChecksPhaseTag, IPUWorkflowTag) -+ -+ def process(self): -+ if has_package(InstalledRedHatSignedRPM, 'docker') or has_package(InstalledRedHatSignedRPM, 'docker-client') or has_package(InstalledRedHatSignedRPM, 'docker-common'): -+ create_report([ -+ reporting.Title('Some important changes with docker'), -+ reporting.Summary( -+ 'In Anolis 8, docker is provided by podman-docker defaultly, and docker is just swapper of podman.\n' -+ 'Anolis 8 provides podman/runc/crun/buildah/skopo same as RedHat 8, refer to https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/building_running_and_managing_containers.\n' -+ 'Anolis 8 also provides solutions to use docker-ce, refer to https://openanolis.cn/sig/third_software_compatibility/doc/400880695004037434.' -+ ), -+ reporting.Severity(reporting.Severity.HIGH), -+ reporting.Remediation(hint='Please note the change of docker on anolis8.'), -+ reporting.RelatedResource('package', 'docker') -+ ]) -+ -diff --git a/repos/system_upgrade/el7toel8/actors/checkdocker/tests/component_test_checkdocker.py b/repos/system_upgrade/el7toel8/actors/checkdocker/tests/component_test_checkdocker.py -new file mode 100644 -index 0000000..20bea61 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkdocker/tests/component_test_checkdocker.py -@@ -0,0 +1,34 @@ -+from leapp.snactor.fixture import current_actor_context -+from leapp.models import InstalledRedHatSignedRPM, RPM -+from leapp.reporting import Report -+ -+RH_PACKAGER = 'Red Hat, Inc. ' -+ -+ -+def create_modulesfacts(installed_rpm): -+ return InstalledRedHatSignedRPM(items=installed_rpm) -+ -+ -+def test_actor_with_docker_package(current_actor_context): -+ with_docker = [ -+ RPM(name='docker', version='1.13.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=with_docker)) -+ current_actor_context.run() -+ assert current_actor_context.consume(Report) -+ -+ -+def test_actor_without_docker_package(current_actor_context): -+ without_docker = [ -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='sed', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=without_docker)) -+ current_actor_context.run() -+ assert not current_actor_context.consume(Report) -+ --- -2.19.1.6.gb485710b - -- Gitee From 9579e1ccea275561aac3e06e4809363e91015dc5 Mon Sep 17 00:00:00 2001 From: wangzhe Date: Thu, 25 May 2023 19:24:27 +0800 Subject: [PATCH 4/5] switch from rpm tree to source tree, remove 0001~0009 patch Signed-off-by: wangzhe --- ...to-support-upgrade-of-centos7-to-cen.patch | 27 - 0002-support-centos.patch | 73 - ...form_id-should-be-an8-instead-of-el8.patch | 78 - 0004-update-RHEL8-to-anolis8.patch | 1607 ----------------- ...-rhsm-related-settings-after-upgrade.patch | 495 ----- 0006-add-check-extra-modules.patch | 145 -- 0007-add-checkopenssl.patch | 142 -- ...rm_id-to-al8-when-upgrade-to-alinux3.patch | 46 - 0009-add-checksysstat.patch | 96 - 9 files changed, 2709 deletions(-) delete mode 100644 0001-add-centos7-key-to-support-upgrade-of-centos7-to-cen.patch delete mode 100644 0002-support-centos.patch delete mode 100644 0003-on-anolis-platform_id-should-be-an8-instead-of-el8.patch delete mode 100644 0004-update-RHEL8-to-anolis8.patch delete mode 100644 0005-remove-rhsm-related-settings-after-upgrade.patch delete mode 100644 0006-add-check-extra-modules.patch delete mode 100644 0007-add-checkopenssl.patch delete mode 100644 0008-compat-platform_id-to-al8-when-upgrade-to-alinux3.patch delete mode 100644 0009-add-checksysstat.patch diff --git a/0001-add-centos7-key-to-support-upgrade-of-centos7-to-cen.patch b/0001-add-centos7-key-to-support-upgrade-of-centos7-to-cen.patch deleted file mode 100644 index 3e42591..0000000 --- a/0001-add-centos7-key-to-support-upgrade-of-centos7-to-cen.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0ae35d7ebd0037ab49a228e5d4f21fab9d33c9f2 Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Sat, 8 May 2021 19:42:47 +0800 -Subject: [PATCH 1/2] add centos7 key to support upgrade of centos7 to centos8 - -Signed-off-by: Chunmei Xu ---- - .../el7toel8/actors/redhatsignedrpmscanner/actor.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/redhatsignedrpmscanner/actor.py b/repos/system_upgrade/el7toel8/actors/redhatsignedrpmscanner/actor.py -index aab802c..d7565f0 100644 ---- a/repos/system_upgrade/el7toel8/actors/redhatsignedrpmscanner/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/redhatsignedrpmscanner/actor.py -@@ -25,7 +25,8 @@ class RedHatSignedRpmScanner(Actor): - '5326810137017186', - '938a80caf21541eb', - 'fd372689897da07a', -- '45689c882fa658e0'] -+ '45689c882fa658e0', -+ '24c6a8a7f4a80eb5'] - - signed_pkgs = InstalledRedHatSignedRPM() - unsigned_pkgs = InstalledUnsignedRPM() --- -2.29.2 - diff --git a/0002-support-centos.patch b/0002-support-centos.patch deleted file mode 100644 index b6b1be5..0000000 --- a/0002-support-centos.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 1ba160753779427eff3cdd63f48cbd93b5836630 Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Tue, 11 May 2021 11:54:04 +0800 -Subject: [PATCH 2/2] support centos - -Signed-off-by: Chunmei Xu ---- - .../libraries/ipuworkflowconfig.py | 21 ++++++++++++++++++- - .../el7toel8/libraries/config/version.py | 4 ++-- - 2 files changed, 22 insertions(+), 3 deletions(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/ipuworkflowconfig/libraries/ipuworkflowconfig.py b/repos/system_upgrade/el7toel8/actors/ipuworkflowconfig/libraries/ipuworkflowconfig.py -index 5e20937..323a72e 100644 ---- a/repos/system_upgrade/el7toel8/actors/ipuworkflowconfig/libraries/ipuworkflowconfig.py -+++ b/repos/system_upgrade/el7toel8/actors/ipuworkflowconfig/libraries/ipuworkflowconfig.py -@@ -1,4 +1,6 @@ - import os -+import subprocess -+import re - - from leapp.exceptions import StopActorExecutionError - from leapp.libraries.stdlib import run, CalledProcessError -@@ -35,6 +37,23 @@ def get_env_vars(): - - return env_vars - -+def get_os_version_id(version_id): -+ """CentOS version_id is always 7 or 8, so we retrive from centos-release.""" -+ -+ old_version = subprocess.check_output("rpm -q --whatprovides /etc/redhat-release", shell=True) -+ old_version = str(old_version).encode("utf-8") -+ old_version = old_version.split('\n')[:-1] -+ old_version = old_version[0] -+ if re.match('centos-linux-release', old_version): -+ mainver = old_version.split('-')[3] -+ subver = old_version.split('-')[4].split('.')[0] -+ return mainver+'.'+subver -+ elif re.match('centos-release', old_version): -+ mainver = old_version.split('-')[2] -+ subver = old_version.split('-')[3].split('.')[0] -+ return mainver+'.'+subver -+ else: -+ return version_id - - def get_os_release(path): - """Retrieve data about System OS release from provided file.""" -@@ -46,7 +65,7 @@ def get_os_release(path): - name=data.get('NAME', '').strip('"'), - pretty_name=data.get('PRETTY_NAME', '').strip('"'), - version=data.get('VERSION', '').strip('"'), -- version_id=data.get('VERSION_ID', '').strip('"'), -+ version_id=get_os_version_id(data.get('VERSION_ID', '').strip('"')), - variant=data.get('VARIANT', '').strip('"') or None, - variant_id=data.get('VARIANT_ID', '').strip('"') or None - ) -diff --git a/repos/system_upgrade/el7toel8/libraries/config/version.py b/repos/system_upgrade/el7toel8/libraries/config/version.py -index 271f985..6374599 100644 ---- a/repos/system_upgrade/el7toel8/libraries/config/version.py -+++ b/repos/system_upgrade/el7toel8/libraries/config/version.py -@@ -12,8 +12,8 @@ OP_MAP = { - } - - # Note: 'rhel-alt' is detected when on 'rhel' with kernel 4.x --SUPPORTED_VERSIONS = {'rhel': ['7.9'], 'rhel-alt': ['7.6'], 'rhel-saphana': ['7.7']} -- -+SUPPORTED_VERSIONS = {'rhel': ['7.9'], 'rhel-alt': ['7.6'], 'rhel-saphana': ['7.7'], -+ 'centos': ['7.0', '7.1', '7.2', '7.3', '7.4', '7.5', '7.6', '7.7', '7.8', '7.9']} - - def _version_to_tuple(version): - """Converts the version string ``major.minor`` to ``(major, minor)`` int tuple.""" --- -2.29.2 - diff --git a/0003-on-anolis-platform_id-should-be-an8-instead-of-el8.patch b/0003-on-anolis-platform_id-should-be-an8-instead-of-el8.patch deleted file mode 100644 index c7913f7..0000000 --- a/0003-on-anolis-platform_id-should-be-an8-instead-of-el8.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 1506fc7e88e504751eb7ceaecef4de4b849ff30c Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Wed, 19 May 2021 16:23:19 +0800 -Subject: [PATCH 3/3] on anolis platform_id should be an8 instead of el8 - -Signed-off-by: Chunmei Xu ---- - .../targetuserspacecreator/libraries/userspacegen.py | 10 +++++++++- - repos/system_upgrade/el7toel8/libraries/dnfplugin.py | 11 +++++++++-- - 2 files changed, 18 insertions(+), 3 deletions(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/libraries/userspacegen.py b/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/libraries/userspacegen.py -index 69b3e6a..b2d40aa 100644 ---- a/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/libraries/userspacegen.py -+++ b/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/libraries/userspacegen.py -@@ -102,6 +102,14 @@ class _InputData(object): - raise StopActorExecutionError('No storage info available cannot proceed.') - - -+def get_platform_id(target_repoids): -+ platform_id = 'platform:el8' -+ for repo in target_repoids: -+ if repo.find('Anolis') != -1 or repo.find('anolis') != -1: -+ platform_id = 'platform:an8' -+ return platform_id -+ return platform_id -+ - def prepare_target_userspace(context, userspace_dir, enabled_repos, packages): - """ - Implement the creation of the target userspace. -@@ -115,7 +123,7 @@ def prepare_target_userspace(context, userspace_dir, enabled_repos, packages): - 'install', - '-y', - '--nogpgcheck', -- '--setopt=module_platform_id=platform:el8', -+ '--setopt=module_platform_id='+get_platform_id(enabled_repos), - '--setopt=keepcache=1', - '--releasever', api.current_actor().configuration.version.target, - '--installroot', '/el8target', -diff --git a/repos/system_upgrade/el7toel8/libraries/dnfplugin.py b/repos/system_upgrade/el7toel8/libraries/dnfplugin.py -index 719e916..d271212 100644 ---- a/repos/system_upgrade/el7toel8/libraries/dnfplugin.py -+++ b/repos/system_upgrade/el7toel8/libraries/dnfplugin.py -@@ -30,6 +30,13 @@ def install(target_basedir): - message='Failed to install DNF plugin. Error: {}'.format(str(e)) - ) - -+def get_platform_id(target_repoids): -+ platform_id = 'platform:el8' -+ for repo in target_repoids: -+ if repo.find('Anolis') != -1 or repo.find('anolis') != -1: -+ platform_id = 'platform:an8' -+ return platform_id -+ return platform_id - - def build_plugin_data(target_repoids, debug, test, tasks, on_aws): - """ -@@ -50,7 +57,7 @@ def build_plugin_data(target_repoids, debug, test, tasks, on_aws): - 'disable_repos': True, - 'enable_repos': target_repoids, - 'gpgcheck': False, -- 'platform_id': 'platform:el8', -+ 'platform_id': get_platform_id(target_repoids), - 'releasever': api.current_actor().configuration.version.target, - 'installroot': '/installroot', - 'test_flag': test -@@ -175,7 +182,7 @@ def install_initramdisk_requirements(packages, target_userspace_info, used_repos - 'install', - '-y', - '--nogpgcheck', -- '--setopt=module_platform_id=platform:el8', -+ '--setopt=module_platform_id='+get_platform_id(target_repoids), - '--setopt=keepcache=1', - '--releasever', api.current_actor().configuration.version.target, - '--disablerepo', '*' --- -2.29.2 - diff --git a/0004-update-RHEL8-to-anolis8.patch b/0004-update-RHEL8-to-anolis8.patch deleted file mode 100644 index f74d4dc..0000000 --- a/0004-update-RHEL8-to-anolis8.patch +++ /dev/null @@ -1,1607 +0,0 @@ -From dcd8439de78f2775e4b55605f5daca00b9509605 Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Wed, 9 Jun 2021 16:39:27 +0800 -Subject: [PATCH] update RHEL8 to anolis8 - -Signed-off-by: Chunmei Xu ---- - .../el7toel8/actors/authselectcheck/actor.py | 10 +++++----- - .../el7toel8/actors/biosdevname/actor.py | 2 +- - .../actors/biosdevname/libraries/biosdevname.py | 2 +- - .../actors/biosdevname/tests/test_biosdevname.py | 2 +- - .../el7toel8/actors/checkbtrfs/actor.py | 6 +++--- - .../el7toel8/actors/checkchrony/actor.py | 2 +- - .../actors/checkchrony/libraries/checkchrony.py | 4 ++-- - .../el7toel8/actors/checkcpu/actor.py | 2 +- - .../el7toel8/actors/checkcpu/libraries/cpu.py | 2 +- - .../el7toel8/actors/checkfirewalld/actor.py | 2 +- - .../actors/checkfstabxfsoptions/actor.py | 4 ++-- - .../libraries/checkfstabxfsoptions.py | 2 +- - .../checkipaserver/libraries/checkipaserver.py | 4 ++-- - .../checkkdegnome/libraries/checkkdegnome.py | 8 ++++---- - .../el7toel8/actors/checkmemcached/actor.py | 2 +- - .../checkmemcached/libraries/checkmemcached.py | 6 +++--- - .../el7toel8/actors/checkmemory/actor.py | 2 +- - .../actors/checkmemory/libraries/checkmemory.py | 2 +- - .../actors/checkmemory/tests/test_checkmemory.py | 2 +- - .../checkosrelease/libraries/checkosrelease.py | 2 +- - .../actors/checkremovedpammodules/actor.py | 2 +- - .../el7toel8/actors/checksaphana/actor.py | 2 +- - .../el7toel8/actors/checkskipphase/actor.py | 2 +- - .../libraries/checktargetrepos.py | 4 ++-- - .../actors/enablerhsmreposonrhel8/actor.py | 8 ++++---- - .../libraries/enablerhsmreposonrhel8.py | 6 +++--- - .../firewalldupdatelockdownwhitelist/actor.py | 4 ++-- - .../el7toel8/actors/initrdinclude/actor.py | 2 +- - .../initrdinclude/libraries/initrdinclude.py | 4 ++-- - .../initrdinclude/tests/test_initrdinclude.py | 2 +- - .../actors/kernel/checkkerneldrivers/actor.py | 14 +++++++------- - .../tests/unit_test_checkkerneldrivers.py | 2 +- - .../el7toel8/actors/kernelcmdlineconfig/actor.py | 2 +- - .../el7toel8/actors/multipathconfcheck/actor.py | 2 +- - .../libraries/multipathconfcheck.py | 10 +++++----- - .../el7toel8/actors/multipathconfupdate/actor.py | 4 ++-- - .../actors/networkmanagerupdateconfig/actor.py | 2 +- - .../libraries/opensshalgorithmscheck.py | 4 ++-- - .../actors/opensshpermitrootlogincheck/actor.py | 2 +- - .../libraries/opensshprotocolcheck.py | 2 +- - .../opensshuseprivilegeseparationcheck.py | 2 +- - .../actors/persistentnetnamesconfig/actor.py | 4 ++-- - .../libraries/persistentnetnamesconfig.py | 2 +- - .../actors/persistentnetnamesdisable/actor.py | 2 +- - .../libraries/peseventsscanner.py | 16 ++++++++-------- - .../el7toel8/actors/pythoninformuser/actor.py | 6 +++--- - .../el7toel8/actors/quaggareport/actor.py | 6 +++--- - .../el7toel8/actors/quaggatofrr/actor.py | 2 +- - .../actors/removeleftoverpackages/actor.py | 2 +- - .../actors/removeoldpammodulesapply/actor.py | 2 +- - .../actors/removeoldpammodulescheck/actor.py | 12 ++++++------ - .../actors/removeoldpammodulesscanner/actor.py | 4 ++-- - .../libraries/removeoldpammodulesscanner.py | 4 ++-- - .../libraries/reportsettargetrelease.py | 4 ++-- - .../libraries/repositoriesblacklist.py | 4 ++-- - .../libraries/scankernel.py | 4 ++-- - .../el7toel8/actors/sctpconfigread/actor.py | 2 +- - .../el7toel8/actors/sctpconfigupdate/actor.py | 4 ++-- - .../actors/selinux/selinuxapplycustom/actor.py | 2 +- - .../selinux/selinuxcontentscanner/actor.py | 2 +- - .../libraries/selinuxcontentscanner.py | 6 +++--- - .../actors/spamassassinconfigcheck/actor.py | 4 ++-- - .../test_lib_spamd_spamassassinconfigupdate.py | 2 +- - .../el7toel8/actors/sssdcheck/actor.py | 2 +- - .../el7toel8/actors/sssdfacts/actor.py | 2 +- - .../actors/sssdfacts/libraries/sssdfacts.py | 2 +- - .../libraries/userspacegen.py | 8 ++++---- - .../tests/unit_test_targetuserspacecreator.py | 4 ++-- - .../el7toel8/actors/tcpwrapperscheck/actor.py | 4 ++-- - .../updategrubcore/libraries/updategrubcore.py | 2 +- - .../el7toel8/actors/vsftpdconfigcheck/actor.py | 2 +- - .../libraries/vsftpdconfigcheck.py | 4 ++-- - .../el7toel8/actors/vsftpdconfigupdate/actor.py | 2 +- - .../system_upgrade/el7toel8/models/authselect.py | 2 +- - repos/system_upgrade/el7toel8/models/cpuinfo.py | 2 +- - .../el7toel8/models/initrdincludes.py | 2 +- - .../el7toel8/models/kernelcmdlineargs.py | 2 +- - .../el7toel8/models/opensshconfig.py | 4 ++-- - .../el7toel8/models/removedpammodules.py | 4 ++-- - .../el7toel8/models/repositoriesmap.py | 8 ++++---- - repos/system_upgrade/el7toel8/models/selinux.py | 2 +- - .../el7toel8/workflows/inplace_upgrade.py | 2 +- - 82 files changed, 153 insertions(+), 153 deletions(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/authselectcheck/actor.py b/repos/system_upgrade/el7toel8/actors/authselectcheck/actor.py -index 4d235b0..846dc23 100644 ---- a/repos/system_upgrade/el7toel8/actors/authselectcheck/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/authselectcheck/actor.py -@@ -42,7 +42,7 @@ class AuthselectCheck(Actor): - 'PAM and nsswitch.conf configuration. ' - 'If no, current configuration will be kept ' - 'intact.', -- reason='There is a new tool called authselect in RHEL8 ' -+ reason='There is a new tool called authselect in Anolis8 ' - 'that replaced authconfig which is used to manage ' - 'authentication (PAM) and identity (nsswitch.conf) ' - 'sources. It is recommended to switch to this tool.' -@@ -97,7 +97,7 @@ class AuthselectCheck(Actor): - 'Authselect will be used to configure PAM and nsswitch.conf.' - ), - reporting.Summary( -- 'There is a new tool called authselect in RHEL8 that ' -+ 'There is a new tool called authselect in Anolis8 that ' - 'replaced authconfig. The upgrade process detected ' - 'that authconfig was used to generate current ' - 'configuration and it will automatically convert it ' -@@ -123,7 +123,7 @@ class AuthselectCheck(Actor): - 'Current PAM and nsswitch.conf configuration will be kept.' - ), - reporting.Summary( -- 'There is a new tool called authselect in RHEL8 that ' -+ 'There is a new tool called authselect in Anolis8 that ' - 'replaced authconfig. The upgrade process was unable ' - 'to find an authselect profile that would be equivalent ' - 'to your current configuration. Therefore your ' -@@ -149,7 +149,7 @@ class AuthselectCheck(Actor): - 'Authselect will be used to configure PAM and nsswitch.conf.' - ), - reporting.Summary( -- 'There is a new tool called authselect in RHEL8 that ' -+ 'There is a new tool called authselect in Anolis8 that ' - 'replaced authconfig. The upgrade process suggested ' - 'an authselect profile that is similar to your ' - 'current configuration and your system will be switched ' -@@ -169,7 +169,7 @@ class AuthselectCheck(Actor): - 'Current PAM and nsswitch.conf configuration will be kept.' - ), - reporting.Summary( -- 'There is a new tool called authselect in RHEL8 that ' -+ 'There is a new tool called authselect in Anolis8 that ' - 'replaced authconfig. The upgrade process suggested ' - 'an authselect profile that is similar to your ' - 'current configuration. However this suggestion was ' -diff --git a/repos/system_upgrade/el7toel8/actors/biosdevname/actor.py b/repos/system_upgrade/el7toel8/actors/biosdevname/actor.py -index 24ff5f1..e86e717 100644 ---- a/repos/system_upgrade/el7toel8/actors/biosdevname/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/biosdevname/actor.py -@@ -6,7 +6,7 @@ from leapp.tags import FactsPhaseTag, IPUWorkflowTag - - class Biosdevname(Actor): - """ -- Enable biosdevname on RHEL8 if all interfaces on RHEL7 use biosdevname naming scheme and if machine vendor is DELL -+ Enable biosdevname on Anolis8 if all interfaces on RHEL7 use biosdevname naming scheme and if machine vendor is DELL - """ - - name = 'biosdevname' -diff --git a/repos/system_upgrade/el7toel8/actors/biosdevname/libraries/biosdevname.py b/repos/system_upgrade/el7toel8/actors/biosdevname/libraries/biosdevname.py -index b49a76e..d85a776 100644 ---- a/repos/system_upgrade/el7toel8/actors/biosdevname/libraries/biosdevname.py -+++ b/repos/system_upgrade/el7toel8/actors/biosdevname/libraries/biosdevname.py -@@ -37,7 +37,7 @@ def all_interfaces_biosdevname(interfaces): - - - def enable_biosdevname(): -- api.current_logger().info("Biosdevname naming scheme in use, explicitely enabling biosdevname on RHEL-8") -+ api.current_logger().info("Biosdevname naming scheme in use, explicitely enabling biosdevname on Anolis-8") - api.produce(KernelCmdlineArg(**{'key': 'biosdevname', 'value': '1'})) - - -diff --git a/repos/system_upgrade/el7toel8/actors/biosdevname/tests/test_biosdevname.py b/repos/system_upgrade/el7toel8/actors/biosdevname/tests/test_biosdevname.py -index be7ef98..f4a42d3 100644 ---- a/repos/system_upgrade/el7toel8/actors/biosdevname/tests/test_biosdevname.py -+++ b/repos/system_upgrade/el7toel8/actors/biosdevname/tests/test_biosdevname.py -@@ -112,7 +112,7 @@ def test_enable_biosdevname(monkeypatch): - - biosdevname.enable_biosdevname() - assert ( -- "Biosdevname naming scheme in use, explicitely enabling biosdevname on RHEL-8" -+ "Biosdevname naming scheme in use, explicitely enabling biosdevname on Anolis-8" - in api.current_logger.infomsg - ) - assert result[0].key == "biosdevname" -diff --git a/repos/system_upgrade/el7toel8/actors/checkbtrfs/actor.py b/repos/system_upgrade/el7toel8/actors/checkbtrfs/actor.py -index 73274d3..6f6941d 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkbtrfs/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/checkbtrfs/actor.py -@@ -23,14 +23,14 @@ class CheckBtrfs(Actor): - for active_module in fact.kernel_modules: - if active_module.filename == 'btrfs': - create_report([ -- reporting.Title('Btrfs has been removed from RHEL8'), -+ reporting.Title('Btrfs has been removed from Anolis8'), - reporting.Summary( - 'The Btrfs file system was introduced as Technology Preview with the ' - 'initial release of Red Hat Enterprise Linux 6 and Red Hat Enterprise Linux 7. As of ' -- 'versions 6.6 and 7.4 this technology has been deprecated and removed in RHEL8.' -+ 'versions 6.6 and 7.4 this technology has been deprecated and removed in Anolis8.' - ), - reporting.ExternalLink( -- title='Considerations in adopting RHEL 8 - btrfs has been removed.', -+ title='Considerations in adopting Anolis 8 - btrfs has been removed.', - url='https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/considerations_in_adopting_rhel_8/file-systems-and-storage_considerations-in-adopting-rhel-8#btrfs-has-been-removed_file-systems-and-storage' # noqa: E501; pylint: disable=line-too-long - ), - reporting.Severity(reporting.Severity.HIGH), -diff --git a/repos/system_upgrade/el7toel8/actors/checkchrony/actor.py b/repos/system_upgrade/el7toel8/actors/checkchrony/actor.py -index 13577ea..bd32b85 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkchrony/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/checkchrony/actor.py -@@ -10,7 +10,7 @@ class CheckChrony(Actor): - """ - Check for incompatible changes in chrony configuration. - -- Warn that the default chrony configuration in RHEL8 uses the leapsectz -+ Warn that the default chrony configuration in Anolis8 uses the leapsectz - directive. - """ - -diff --git a/repos/system_upgrade/el7toel8/actors/checkchrony/libraries/checkchrony.py b/repos/system_upgrade/el7toel8/actors/checkchrony/libraries/checkchrony.py -index 89d74cb..2c7d4a8 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkchrony/libraries/checkchrony.py -+++ b/repos/system_upgrade/el7toel8/actors/checkchrony/libraries/checkchrony.py -@@ -29,7 +29,7 @@ def check_chrony(chrony_installed): - reporting.create_report([ - reporting.Title('chrony using default configuration'), - reporting.Summary( -- 'default chrony configuration in RHEL8 uses leapsectz directive, which cannot be used with ' -+ 'default chrony configuration in Anolis8 uses leapsectz directive, which cannot be used with ' - 'leap smearing NTP servers, and uses a single pool directive instead of four server directives' - ), - reporting.Severity(reporting.Severity.MEDIUM), -@@ -42,7 +42,7 @@ def check_chrony(chrony_installed): - else: - reporting.create_report([ - reporting.Title('chrony using non-default configuration'), -- reporting.Summary('chrony behavior will not change in RHEL8'), -+ reporting.Summary('chrony behavior will not change in Anolis8'), - reporting.Severity(reporting.Severity.LOW), - reporting.Tags([ - reporting.Tags.SERVICES, -diff --git a/repos/system_upgrade/el7toel8/actors/checkcpu/actor.py b/repos/system_upgrade/el7toel8/actors/checkcpu/actor.py -index a75dfd1..bf9867d 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkcpu/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/checkcpu/actor.py -@@ -9,7 +9,7 @@ class CheckCPU(Actor): - Check whether the CPU is supported by the target system. Inhibit upgrade if not. - - Currently we know just about cases with s390x where the set of CPUs supported -- by RHEL 8 is subset of CPUs supported on RHEL 7. We can detect such cases based -+ by Anolis 8 is subset of CPUs supported on RHEL 7. We can detect such cases based - on the machine field inside the /proc/cpuinfo file. expected values of the - field on supported machines are: 2964, 2965, 3906, 3907, 8561, 8562. - """ -diff --git a/repos/system_upgrade/el7toel8/actors/checkcpu/libraries/cpu.py b/repos/system_upgrade/el7toel8/actors/checkcpu/libraries/cpu.py -index 3292148..3fc9c48 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkcpu/libraries/cpu.py -+++ b/repos/system_upgrade/el7toel8/actors/checkcpu/libraries/cpu.py -@@ -33,7 +33,7 @@ def process(): - reporting.Tags([reporting.Tags.SANITY]), - reporting.Flags([reporting.Flags.INHIBITOR]), - reporting.ExternalLink( -- title="Considerations in adopting RHEL 8", -+ title="Considerations in adopting Anolis 8", - url=("https://access.redhat.com/ecosystem/hardware/#/search?p=1&" - "c_version=Red%20Hat%20Enterprise%20Linux%208&ch_architecture=s390x")) - ] -diff --git a/repos/system_upgrade/el7toel8/actors/checkfirewalld/actor.py b/repos/system_upgrade/el7toel8/actors/checkfirewalld/actor.py -index 73c4762..e2c6ff2 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkfirewalld/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/checkfirewalld/actor.py -@@ -37,7 +37,7 @@ class CheckFirewalld(Actor): - list_separator_fmt.join(list(set(unsupported_tables))),) - create_report([ - reporting.Title('Firewalld is using an unsupported ebtables table.'), -- reporting.Summary('ebtables in RHEL-8 does not support these tables:{}{}'.format(*format_tuple)), -+ reporting.Summary('ebtables in Anolis-8 does not support these tables:{}{}'.format(*format_tuple)), - reporting.Severity(reporting.Severity.HIGH), - reporting.Tags([ - reporting.Tags.FIREWALL, -diff --git a/repos/system_upgrade/el7toel8/actors/checkfstabxfsoptions/actor.py b/repos/system_upgrade/el7toel8/actors/checkfstabxfsoptions/actor.py -index 94d8b3c..06c5f32 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkfstabxfsoptions/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/checkfstabxfsoptions/actor.py -@@ -10,8 +10,8 @@ class CheckFstabXFSOptions(Actor): - Check the FSTAB file for the deprecated / removed XFS mount options. - - Some mount options for XFS have been deprecated on RHEL 7 and already -- removed on RHEL 8. If any such an option is present in the FSTAB, -- it's impossible to boot the RHEL 8 system without the manual update of the -+ removed on Anolis 8. If any such an option is present in the FSTAB, -+ it's impossible to boot the Anolis 8 system without the manual update of the - file. - - Check whether any of these options are present in the FSTAB file -diff --git a/repos/system_upgrade/el7toel8/actors/checkfstabxfsoptions/libraries/checkfstabxfsoptions.py b/repos/system_upgrade/el7toel8/actors/checkfstabxfsoptions/libraries/checkfstabxfsoptions.py -index 101b344..c74772f 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkfstabxfsoptions/libraries/checkfstabxfsoptions.py -+++ b/repos/system_upgrade/el7toel8/actors/checkfstabxfsoptions/libraries/checkfstabxfsoptions.py -@@ -44,7 +44,7 @@ def process(): - reporting.create_report([ - reporting.Title('Deprecated XFS mount options present in FSTAB.'), - reporting.Summary( -- 'Some XFS mount options are not supported on RHEL 8 and prevent' -+ 'Some XFS mount options are not supported on Anolis 8 and prevent' - ' system from booting correctly if any of the reported XFS options are used.' - ' filesystem:{}{}.'.format( - list_separator_fmt, -diff --git a/repos/system_upgrade/el7toel8/actors/checkipaserver/libraries/checkipaserver.py b/repos/system_upgrade/el7toel8/actors/checkipaserver/libraries/checkipaserver.py -index 2728ef3..b5dff87 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkipaserver/libraries/checkipaserver.py -+++ b/repos/system_upgrade/el7toel8/actors/checkipaserver/libraries/checkipaserver.py -@@ -12,11 +12,11 @@ def ipa_inhibit_upgrade(ipainfo): - """ - entries = [ - reporting.Title( -- "ipa-server does not support in-place upgrade from RHEL 7 to 8" -+ "ipa-server does not support in-place upgrade from RHEL 7 to Anolis 8" - ), - reporting.Summary( - "An IdM server installation was detected on the system. IdM " -- "does not support in-place upgrade to RHEL 8. Please follow " -+ "does not support in-place upgrade to Anolis 8. Please follow " - "the migration guide lines." - ), - reporting.Remediation( -diff --git a/repos/system_upgrade/el7toel8/actors/checkkdegnome/libraries/checkkdegnome.py b/repos/system_upgrade/el7toel8/actors/checkkdegnome/libraries/checkkdegnome.py -index c75053e..7702cba 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkkdegnome/libraries/checkkdegnome.py -+++ b/repos/system_upgrade/el7toel8/actors/checkkdegnome/libraries/checkkdegnome.py -@@ -20,9 +20,9 @@ def check_kde_gnome(): - " no other desktop than KDE installed.") - # We cannot continue with the upgrade process - reporting.create_report([ -- reporting.Title("The installed KDE environment is unavailable on RHEL 8."), -+ reporting.Title("The installed KDE environment is unavailable on Anolis 8."), - reporting.Summary( -- "Because the KDE desktop environment is not available on RHEL 8, all the KDE-related packages" -+ "Because the KDE desktop environment is not available on Anolis 8, all the KDE-related packages" - " would be removed during the upgrade. There would be no desktop environment installed after the" - " upgrade."), - reporting.Severity(reporting.Severity.HIGH), -@@ -44,7 +44,7 @@ def check_kde_gnome(): - " be removed in favor of GNOME") - reporting.create_report([ - reporting.Title("Upgrade can be performed, but KDE will be uninstalled."), -- reporting.Summary("The KDE desktop environment is unavailable on RHEL 8. KDE will be uninstalled " -+ reporting.Summary("The KDE desktop environment is unavailable on Anolis 8. KDE will be uninstalled " - "in favor of GNOME during the upgrade."), - reporting.Severity(reporting.Severity.MEDIUM), - reporting.Tags([ -@@ -62,7 +62,7 @@ def check_kde_gnome(): - api.current_logger().info("Installed KDE/Qt apps detected.") - reporting.create_report([ - reporting.Title("Upgrade can be performed, but KDE/Qt apps will be uninstalled."), -- reporting.Summary("The KDE desktop environment is unavailable on RHEL 8. " -+ reporting.Summary("The KDE desktop environment is unavailable on Anolis 8. " - "All the KDE/Qt apps will be removed during the upgrade, including but not limited " - "to:\n- {0}".format("\n- ".join(KDEAppsFacts.installed_apps))), - reporting.Severity(reporting.Severity.MEDIUM), -diff --git a/repos/system_upgrade/el7toel8/actors/checkmemcached/actor.py b/repos/system_upgrade/el7toel8/actors/checkmemcached/actor.py -index 550e537..53f036d 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkmemcached/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/checkmemcached/actor.py -@@ -10,7 +10,7 @@ class CheckMemcached(Actor): - """ - Check for incompatible changes in memcached configuration. - -- Warn that memcached in RHEL8 no longer listens on the UDP port by default -+ Warn that memcached in Anolis8 no longer listens on the UDP port by default - and the default service configuration binds memcached to the loopback - interface. - """ -diff --git a/repos/system_upgrade/el7toel8/actors/checkmemcached/libraries/checkmemcached.py b/repos/system_upgrade/el7toel8/actors/checkmemcached/libraries/checkmemcached.py -index 0354dfa..c55c968 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkmemcached/libraries/checkmemcached.py -+++ b/repos/system_upgrade/el7toel8/actors/checkmemcached/libraries/checkmemcached.py -@@ -46,7 +46,7 @@ def check_memcached(memcached_installed): - if default_memcached_conf: - reporting.create_report([ - reporting.Title('memcached service is using default configuration'), -- reporting.Summary('memcached in RHEL8 listens on loopback only and has UDP port disabled by default'), -+ reporting.Summary('memcached in Anolis8 listens on loopback only and has UDP port disabled by default'), - reporting.Severity(reporting.Severity.MEDIUM), - reporting.Tags(COMMON_REPORT_TAGS), - ] + related) -@@ -55,7 +55,7 @@ def check_memcached(memcached_installed): - reporting.create_report([ - reporting.Title('memcached has enabled UDP port'), - reporting.Summary( -- 'memcached in RHEL7 has UDP port enabled by default, but it is disabled by default in RHEL8' -+ 'memcached in RHEL7 has UDP port enabled by default, but it is disabled by default in Anolis8' - ), - reporting.Severity(reporting.Severity.MEDIUM), - reporting.Tags(COMMON_REPORT_TAGS), -@@ -64,7 +64,7 @@ def check_memcached(memcached_installed): - else: - reporting.create_report([ - reporting.Title('memcached has already disabled UDP port'), -- reporting.Summary('memcached in RHEL8 has UDP port disabled by default'), -+ reporting.Summary('memcached in Anolis8 has UDP port disabled by default'), - reporting.Severity(reporting.Severity.LOW), - reporting.Tags(COMMON_REPORT_TAGS), - ] + related) -diff --git a/repos/system_upgrade/el7toel8/actors/checkmemory/actor.py b/repos/system_upgrade/el7toel8/actors/checkmemory/actor.py -index 53af11f..b26ae6d 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkmemory/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/checkmemory/actor.py -@@ -6,7 +6,7 @@ from leapp.tags import ChecksPhaseTag, IPUWorkflowTag - - class CheckMemory(Actor): - """ -- The actor check the size of RAM against RHEL8 minimal hardware requirements -+ The actor check the size of RAM against Anolis8 minimal hardware requirements - - Using the following resource: https://access.redhat.com/articles/rhel-limits - """ -diff --git a/repos/system_upgrade/el7toel8/actors/checkmemory/libraries/checkmemory.py b/repos/system_upgrade/el7toel8/actors/checkmemory/libraries/checkmemory.py -index f11d1cf..e1ac567 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkmemory/libraries/checkmemory.py -+++ b/repos/system_upgrade/el7toel8/actors/checkmemory/libraries/checkmemory.py -@@ -32,7 +32,7 @@ def process(): - minimum_req_error = _check_memory(memoryinfo) - - if minimum_req_error: -- title = 'Minimum memory requirements for RHEL 8 are not met' -+ title = 'Minimum memory requirements for Anolis 8 are not met' - summary = 'Memory detected: {} KiB, required: {} KiB'.format(minimum_req_error['detected'], - minimum_req_error['minimal_req']) - reporting.create_report([ -diff --git a/repos/system_upgrade/el7toel8/actors/checkmemory/tests/test_checkmemory.py b/repos/system_upgrade/el7toel8/actors/checkmemory/tests/test_checkmemory.py -index 2ff0901..9361fb6 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkmemory/tests/test_checkmemory.py -+++ b/repos/system_upgrade/el7toel8/actors/checkmemory/tests/test_checkmemory.py -@@ -20,7 +20,7 @@ def test_check_memory_high(monkeypatch): - - - def test_report(monkeypatch): -- title_msg = 'Minimum memory requirements for RHEL 8 are not met' -+ title_msg = 'Minimum memory requirements for Anolis 8 are not met' - monkeypatch.setattr(api, 'current_actor', CurrentActorMocked()) - monkeypatch.setattr(api, 'consume', lambda x: iter([MemoryInfo(mem_total=129)])) - monkeypatch.setattr(reporting, "create_report", create_report_mocked()) -diff --git a/repos/system_upgrade/el7toel8/actors/checkosrelease/libraries/checkosrelease.py b/repos/system_upgrade/el7toel8/actors/checkosrelease/libraries/checkosrelease.py -index 24aa043..223a964 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkosrelease/libraries/checkosrelease.py -+++ b/repos/system_upgrade/el7toel8/actors/checkosrelease/libraries/checkosrelease.py -@@ -31,7 +31,7 @@ def check_os_version(): - for ver in version.SUPPORTED_VERSIONS[rel]: - supported_releases.append(rel.upper() + ' ' + ver) - reporting.create_report([ -- reporting.Title('The installed OS version is not supported for the in-place upgrade to RHEL 8'), -+ reporting.Title('The installed OS version is not supported for the in-place upgrade to Anolis 8'), - reporting.Summary( - 'The supported OS releases for the upgrade process:\n' - ' {}'.format('\n'.join(supported_releases)) -diff --git a/repos/system_upgrade/el7toel8/actors/checkremovedpammodules/actor.py b/repos/system_upgrade/el7toel8/actors/checkremovedpammodules/actor.py -index 40b230c..58d49bb 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkremovedpammodules/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/checkremovedpammodules/actor.py -@@ -9,7 +9,7 @@ from leapp import reporting - - class CheckRemovedPamModules(Actor): - """ -- Check for modules that are not available in RHEL 8 anymore -+ Check for modules that are not available in Anolis 8 anymore - - At this moment, we check only for pam_tally2. Few more modules - are alredy covered in RemoveOldPAMModulesApply actor -diff --git a/repos/system_upgrade/el7toel8/actors/checksaphana/actor.py b/repos/system_upgrade/el7toel8/actors/checksaphana/actor.py -index 70e7814..980037f 100644 ---- a/repos/system_upgrade/el7toel8/actors/checksaphana/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/checksaphana/actor.py -@@ -13,7 +13,7 @@ class CheckSapHana(Actor): - - The following checks are executed: - - If this system is _NOT_ running on x86_64, the upgrade is inhibited. -- - If SAP HANA 1 has been detected on the system the upgrade is inhibited since it is not supported on RHEL8. -+ - If SAP HANA 1 has been detected on the system the upgrade is inhibited since it is not supported on Anolis8. - - If SAP HANA 2 has been detected, the upgrade will be inhibited if an unsupported version for the target release - has been detected. - - If SAP HANA is running the upgrade is inhibited. -diff --git a/repos/system_upgrade/el7toel8/actors/checkskipphase/actor.py b/repos/system_upgrade/el7toel8/actors/checkskipphase/actor.py -index be4da3e..3e4c56a 100644 ---- a/repos/system_upgrade/el7toel8/actors/checkskipphase/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/checkskipphase/actor.py -@@ -8,7 +8,7 @@ class CheckSkipPhase(Actor): - """ - Skip all the subsequent phases until the report phase. - -- The phases that follow after the Checks phase work with the target (RHEL 8) -+ The phases that follow after the Checks phase work with the target (Anolis 8) - user space - stuff around preparing and checking the rpm transaction. - We do not want to process those phases in case of inhibition - e.g. for - a specific HW unsupported by the target system we cannot do anything - we -diff --git a/repos/system_upgrade/el7toel8/actors/checktargetrepos/libraries/checktargetrepos.py b/repos/system_upgrade/el7toel8/actors/checktargetrepos/libraries/checktargetrepos.py -index 7613ece..277f4f8 100644 ---- a/repos/system_upgrade/el7toel8/actors/checktargetrepos/libraries/checktargetrepos.py -+++ b/repos/system_upgrade/el7toel8/actors/checktargetrepos/libraries/checktargetrepos.py -@@ -72,7 +72,7 @@ def process(): - reporting.Severity(reporting.Severity.HIGH), - reporting.Tags([reporting.Tags.SANITY]), - reporting.Flags([reporting.Flags.INHIBITOR]), -- reporting.ExternalLink(url=_IPU_DOC_URL, title='UPGRADING TO RHEL 8'), -+ reporting.ExternalLink(url=_IPU_DOC_URL, title='UPGRADING TO ANOLIS 8'), - reporting.RelatedResource('file', CUSTOM_REPO_PATH), - ]) - elif not (is_ctrf or is_re): -@@ -95,6 +95,6 @@ def process(): - ' message.' - )), - reporting.Severity(reporting.Severity.INFO), -- reporting.ExternalLink(url=_IPU_DOC_URL, title='UPGRADING TO RHEL 8'), -+ reporting.ExternalLink(url=_IPU_DOC_URL, title='UPGRADING TO ANOLIS 8'), - reporting.RelatedResource('file', CUSTOM_REPO_PATH), - ]) -diff --git a/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/actor.py b/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/actor.py -index 451cc4e..06d6e67 100644 ---- a/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/actor.py -@@ -6,15 +6,15 @@ from leapp.tags import FirstBootPhaseTag, IPUWorkflowTag - - class EnableRHSMReposOnRHEL8(Actor): - """ -- On the upgraded RHEL 8, set release and enable repositories that were used during the upgrade transaction. -+ On the upgraded Anolis 8, set release and enable repositories that were used during the upgrade transaction. - -- We are enabling those RHEL 8 repos that are equivalent to the enabled RHEL 7 ones available. The BaseOS and -- AppStream repos are enabled on RHEL 8 by default. Any other repository needs to be enabled specifically using -+ We are enabling those Anolis 8 repos that are equivalent to the enabled Anolis 7 ones available. The BaseOS and -+ AppStream repos are enabled on Anolis 8 by default. Any other repository needs to be enabled specifically using - the subscription-manager (RHSM) utility. In case some custom repo was used during the upgrade transaction, - this won't be enabled by this actors as it is unknown to the subscription-manager. - - We need to overwrite any RHSM release that may have been set before the upgrade, e.g. 7.6. Reasons: -- - If we leave the old RHEL 7 release set, dnf calls on the upgraded RHEL 8 would fail. -+ - If we leave the old RHEL 7 release set, dnf calls on the upgraded Anolis 8 would fail. - - If we merely unset the release, users might end up updating the system to a newer version than the upgrade - was supposed to be upgrading to. - """ -diff --git a/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/libraries/enablerhsmreposonrhel8.py b/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/libraries/enablerhsmreposonrhel8.py -index 8380ed6..fc71ae9 100644 ---- a/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/libraries/enablerhsmreposonrhel8.py -+++ b/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/libraries/enablerhsmreposonrhel8.py -@@ -4,7 +4,7 @@ from leapp.models import UsedTargetRepositories - - - def set_rhsm_release(): -- """Set the RHSM release to the target RHEL 8 minor version.""" -+ """Set the RHSM release to the target Anolis 8 minor version.""" - if rhsm.skip_rhsm(): - api.current_logger().debug('Skipping setting the RHSM release due to --no-rhsm or environment variables.') - return -@@ -17,13 +17,13 @@ def set_rhsm_release(): - rhsm.set_release(mounting.NotIsolatedActions(base_dir='/'), target_version) - except CalledProcessError as err: - api.current_logger().warning('Unable to set the {0} release through subscription-manager. When using dnf,' -- ' content of the latest RHEL 8 minor version will be downloaded.\n{1}' -+ ' content of the latest Anolis 8 minor version will be downloaded.\n{1}' - .format(target_version, str(err))) - - - def enable_rhsm_repos(): - """ -- Try enabling all the RHEL 8 repositories that have been used for the upgrade transaction. -+ Try enabling all the Anolis 8 repositories that have been used for the upgrade transaction. - - In case of custom repositories, the subscription-manager reports an error that it doesn't know them, but it enables - the known repositories. -diff --git a/repos/system_upgrade/el7toel8/actors/firewalldupdatelockdownwhitelist/actor.py b/repos/system_upgrade/el7toel8/actors/firewalldupdatelockdownwhitelist/actor.py -index 2a89fc7..129d077 100644 ---- a/repos/system_upgrade/el7toel8/actors/firewalldupdatelockdownwhitelist/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/firewalldupdatelockdownwhitelist/actor.py -@@ -10,9 +10,9 @@ class FirewalldUpdateLockdownWhitelist(Actor): - """ - Update the firewalld Lockdown Whitelist. - -- RHEL-8 uses a platform specific python interpreter for packaged -+ Anolis-8 uses a platform specific python interpreter for packaged - applications. For firewall-config, the interpreter path is part of the -- lockdown list. In RHEL-7 this was simply /usr/bin/python, but in RHEL-8 -+ lockdown list. In RHEL-7 this was simply /usr/bin/python, but in Anolis-8 - it's /usr/libexec/platform-python. However, if the user made changes to the - lockdown whitelist it won't be replaced by RPM/dnf. As such we must update - the interpreter if the old value is there. -diff --git a/repos/system_upgrade/el7toel8/actors/initrdinclude/actor.py b/repos/system_upgrade/el7toel8/actors/initrdinclude/actor.py -index 025225b..beb0fd9 100644 ---- a/repos/system_upgrade/el7toel8/actors/initrdinclude/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/initrdinclude/actor.py -@@ -6,7 +6,7 @@ from leapp.tags import IPUWorkflowTag, FinalizationPhaseTag - - class InitrdInclude(Actor): - """ -- Regenerate RHEL-8 initrd and include files produced by other actors -+ Regenerate Anolis-8 initrd and include files produced by other actors - """ - - name = 'initrdinclude' -diff --git a/repos/system_upgrade/el7toel8/actors/initrdinclude/libraries/initrdinclude.py b/repos/system_upgrade/el7toel8/actors/initrdinclude/libraries/initrdinclude.py -index 0a2a8c1..0453c99 100644 ---- a/repos/system_upgrade/el7toel8/actors/initrdinclude/libraries/initrdinclude.py -+++ b/repos/system_upgrade/el7toel8/actors/initrdinclude/libraries/initrdinclude.py -@@ -12,8 +12,8 @@ def process(): - target_kernel = next(api.consume(InstalledTargetKernelVersion), None) - if not target_kernel: - raise StopActorExecutionError( -- "Cannot get version of the installed RHEL-8 kernel", -- details={'Problem': 'Did not receive a message with installed RHEL-8 kernel version' -+ "Cannot get version of the installed Anolis-8 kernel", -+ details={'Problem': 'Did not receive a message with installed Anolis-8 kernel version' - ' (InstalledTargetKernelVersion)'}) - - try: -diff --git a/repos/system_upgrade/el7toel8/actors/initrdinclude/tests/test_initrdinclude.py b/repos/system_upgrade/el7toel8/actors/initrdinclude/tests/test_initrdinclude.py -index 0732769..497f51a 100644 ---- a/repos/system_upgrade/el7toel8/actors/initrdinclude/tests/test_initrdinclude.py -+++ b/repos/system_upgrade/el7toel8/actors/initrdinclude/tests/test_initrdinclude.py -@@ -51,7 +51,7 @@ def test_no_kernel_version(monkeypatch): - - with pytest.raises(StopActorExecutionError) as e: - initrdinclude.process() -- assert 'Cannot get version of the installed RHEL-8 kernel' in str(e) -+ assert 'Cannot get version of the installed Anolis-8 kernel' in str(e) - assert not run_mocked.called - - -diff --git a/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py -index 19fefc3..99bdd98 100644 ---- a/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/actor.py -@@ -12,14 +12,14 @@ from leapp.tags import ChecksPhaseTag, IPUWorkflowTag - - class CheckKernelDrivers(Actor): - """ -- Actor checks if any loaded RHEL7 kernel driver is missing in the RHEL8. -+ Actor checks if any loaded RHEL7 kernel driver is missing in the Anolis8. - If yes, the upgrade process will be inhibited. - -- Inhibition is done because missing kernel driver on the RHEL8 system may -- mean that the hardware using such driver would not work on the RHEL8. -+ Inhibition is done because missing kernel driver on the Anolis8 system may -+ mean that the hardware using such driver would not work on the Anolis8. - - Note: -- - List of kernel drivers missing on the RHEL8 system is located in the -+ - List of kernel drivers missing on the Anolis8 system is located in the - files/removed_drivers.txt file. - """ - name = 'check_kernel_drivers' -@@ -33,11 +33,11 @@ class CheckKernelDrivers(Actor): - - if conflicting: - title = ('Detected loaded kernel drivers which have been removed ' -- 'in RHEL 8. Upgrade cannot proceed.') -+ 'in Anolis 8. Upgrade cannot proceed.') - URL = ('https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/' - 'considerations_in_adopting_rhel_8/index#removed-device-drivers_hardware-enablement') -- summary = ('Support for the following RHEL 7 ' -- 'device drivers has been removed in RHEL 8: \n - {}' -+ summary = ('Support for the following Anolis 7 ' -+ 'device drivers has been removed in Anolis 8: \n - {}' - '\nPlease see {} for details.'.format('\n - '.join(conflicting), URL)) - remediation = ('Please disable detected kernel drivers in ' - 'order to proceed with the upgrade process using the rmmod or modprobe -r.') -diff --git a/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/tests/unit_test_checkkerneldrivers.py b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/tests/unit_test_checkkerneldrivers.py -index 8ab496a..33774f7 100644 ---- a/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/tests/unit_test_checkkerneldrivers.py -+++ b/repos/system_upgrade/el7toel8/actors/kernel/checkkerneldrivers/tests/unit_test_checkkerneldrivers.py -@@ -37,7 +37,7 @@ def test_drivers(devices, expected, current_actor_context): - Tests CheckKernelDrivers actor by feeding it mocked PCI devices with their - respective drivers, if they have one. Actor should produce a report iff any - mocked devices from devices_removed are fed to the actor, since their -- drivers are removed in RHEL8 (as per 'files/removed_drivers.txt'). -+ drivers are removed in Anolis8 (as per 'files/removed_drivers.txt'). - """ - current_actor_context.feed(PCIDevices(devices=devices)) - current_actor_context.run() -diff --git a/repos/system_upgrade/el7toel8/actors/kernelcmdlineconfig/actor.py b/repos/system_upgrade/el7toel8/actors/kernelcmdlineconfig/actor.py -index 5d34220..dff52f0 100644 ---- a/repos/system_upgrade/el7toel8/actors/kernelcmdlineconfig/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/kernelcmdlineconfig/actor.py -@@ -9,7 +9,7 @@ from leapp.libraries.actor import kernelcmdlineconfig - - class KernelCmdlineConfig(Actor): - """ -- Append extra arguments to RHEL-8 kernel command line -+ Append extra arguments to Anolis-8 kernel command line - """ - - name = 'kernelcmdlineconfig' -diff --git a/repos/system_upgrade/el7toel8/actors/multipathconfcheck/actor.py b/repos/system_upgrade/el7toel8/actors/multipathconfcheck/actor.py -index f4b8732..164433c 100644 ---- a/repos/system_upgrade/el7toel8/actors/multipathconfcheck/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/multipathconfcheck/actor.py -@@ -7,7 +7,7 @@ from leapp.tags import ChecksPhaseTag, IPUWorkflowTag - - class MultipathConfCheck(Actor): - """ -- Checks whether the multipath configuration can be updated to RHEL-8. -+ Checks whether the multipath configuration can be updated to Anolis-8. - Specifically, it checks if the path_checker/checker option is set to - something other than tur in the defaults section. If so, non-trivial - changes may be required in the multipath.conf file, and it is not -diff --git a/repos/system_upgrade/el7toel8/actors/multipathconfcheck/libraries/multipathconfcheck.py b/repos/system_upgrade/el7toel8/actors/multipathconfcheck/libraries/multipathconfcheck.py -index 173923c..0802f4e 100644 ---- a/repos/system_upgrade/el7toel8/actors/multipathconfcheck/libraries/multipathconfcheck.py -+++ b/repos/system_upgrade/el7toel8/actors/multipathconfcheck/libraries/multipathconfcheck.py -@@ -39,9 +39,9 @@ def _check_default_path_checker(options): - ), - reporting.Summary( - 'device-mapper-multipath has changed the default path_checker ' -- 'from "directio" to "tur" in RHEL-8. Further, changing the ' -+ 'from "directio" to "tur" in Anolis-8. Further, changing the ' - 'default path_checker can cause issues with built-in device ' -- 'configurations in RHEL-8. Please remove the "path_checker" ' -+ 'configurations in Anolis-8. Please remove the "path_checker" ' - 'option from the defaults section of {}, and add it to the ' - 'device configuration of any devices that need it.'. - format(pathname) -@@ -80,10 +80,10 @@ def _check_default_detection(options): - 'device-mapper-multipath now defaults to detecting settings' - ), - reporting.Summary( -- 'In RHEL-8, the default value for the "detect_path_checker", ' -+ 'In Anolis-8, the default value for the "detect_path_checker", ' - '"detect_prio" and "retain_attached_hw_handler" options has ' - 'changed to "yes". Further, changing these default values can ' -- 'cause issues with the built-in device configurations in RHEL-8. ' -+ 'cause issues with the built-in device configurations in Anolis-8. ' - 'They will be commented out in the defaults section of all ' - 'multipath config files. This is unlikely to cause any issues ' - 'with existing configurations. If it does, please move these ' -@@ -108,7 +108,7 @@ def _check_reassign_maps(options): - 'device-mapper-multipath now disables reassign_maps by default' - ), - reporting.Summary( -- 'In RHEL-8, the default value for "reassign_maps" has been ' -+ 'In Anolis-8, the default value for "reassign_maps" has been ' - 'changed to "no", and it is not recommended to enable it in any ' - 'configuration going forward. This option will be commented out ' - 'in {}.'.format(pathname) -diff --git a/repos/system_upgrade/el7toel8/actors/multipathconfupdate/actor.py b/repos/system_upgrade/el7toel8/actors/multipathconfupdate/actor.py -index fd20f90..3f36878 100644 ---- a/repos/system_upgrade/el7toel8/actors/multipathconfupdate/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/multipathconfupdate/actor.py -@@ -6,10 +6,10 @@ from leapp.tags import ApplicationsPhaseTag, IPUWorkflowTag - - class MultipathConfUpdate(Actor): - """ -- Modifies multipath configuration files on the target RHEL-8 system so that -+ Modifies multipath configuration files on the target Anolis-8 system so that - they will run properly. This is done in three ways - 1. commenting out lines for options that no longer exist, or whose value -- is no longer current in RHEL-8 -+ is no longer current in Anolis-8 - 2. Migrating any options in an devices section with all_devs to an - overrides setions - 3. Rename options that have changed names -diff --git a/repos/system_upgrade/el7toel8/actors/networkmanagerupdateconfig/actor.py b/repos/system_upgrade/el7toel8/actors/networkmanagerupdateconfig/actor.py -index be197ff..47ab4ea 100644 ---- a/repos/system_upgrade/el7toel8/actors/networkmanagerupdateconfig/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/networkmanagerupdateconfig/actor.py -@@ -4,7 +4,7 @@ from leapp.tags import ApplicationsPhaseTag, IPUWorkflowTag - - - snippet_path = '/usr/lib/NetworkManager/conf.d/10-dhcp-dhclient.conf' --snippet_data = ("# Generated by leapp when upgrading from RHEL7 to RHEL8\n" -+snippet_data = ("# Generated by leapp when upgrading from RHEL7 to Anolis8\n" - "[main]\n" - "dhcp=dhclient\n") - -diff --git a/repos/system_upgrade/el7toel8/actors/opensshalgorithmscheck/libraries/opensshalgorithmscheck.py b/repos/system_upgrade/el7toel8/actors/opensshalgorithmscheck/libraries/opensshalgorithmscheck.py -index 0f8d4fa..5f86376 100644 ---- a/repos/system_upgrade/el7toel8/actors/opensshalgorithmscheck/libraries/opensshalgorithmscheck.py -+++ b/repos/system_upgrade/el7toel8/actors/opensshalgorithmscheck/libraries/opensshalgorithmscheck.py -@@ -42,7 +42,7 @@ def process(openssh_messages): - reporting.Summary( - 'OpenSSH is configured to use removed ciphers {}. ' - 'These ciphers were removed from OpenSSH and if ' -- 'present the sshd daemon will not start in RHEL 8' -+ 'present the sshd daemon will not start in Anolis 8' - ''.format(','.join(found_ciphers)) - ), - reporting.Severity(reporting.Severity.HIGH), -@@ -65,7 +65,7 @@ def process(openssh_messages): - reporting.Summary( - 'OpenSSH is configured to use removed mac {}. ' - 'This MAC was removed from OpenSSH and if present ' -- 'the sshd daemon will not start in RHEL 8' -+ 'the sshd daemon will not start in Anolis 8' - ''.format(','.join(found_macs)) - ), - reporting.Severity(reporting.Severity.HIGH), -diff --git a/repos/system_upgrade/el7toel8/actors/opensshpermitrootlogincheck/actor.py b/repos/system_upgrade/el7toel8/actors/opensshpermitrootlogincheck/actor.py -index da715d3..5f33c8c 100644 ---- a/repos/system_upgrade/el7toel8/actors/opensshpermitrootlogincheck/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/opensshpermitrootlogincheck/actor.py -@@ -50,7 +50,7 @@ class OpenSshPermitRootLoginCheck(Actor): - reporting.Summary( - 'OpenSSH configuration file does not explicitly state ' - 'the option PermitRootLogin in sshd_config file, ' -- 'which will default in RHEL8 to "prohibit-password".' -+ 'which will default in Anolis8 to "prohibit-password".' - ), - reporting.Severity(reporting.Severity.HIGH), - reporting.Tags(COMMON_REPORT_TAGS), -diff --git a/repos/system_upgrade/el7toel8/actors/opensshprotocolcheck/libraries/opensshprotocolcheck.py b/repos/system_upgrade/el7toel8/actors/opensshprotocolcheck/libraries/opensshprotocolcheck.py -index c39cf84..3003552 100644 ---- a/repos/system_upgrade/el7toel8/actors/opensshprotocolcheck/libraries/opensshprotocolcheck.py -+++ b/repos/system_upgrade/el7toel8/actors/opensshprotocolcheck/libraries/opensshprotocolcheck.py -@@ -18,7 +18,7 @@ def process(openssh_messages): - reporting.Summary( - 'OpenSSH is configured with removed configuration ' - 'option Protocol. If this used to be for enabling ' -- 'SSHv1, this is no longer supported in RHEL 8. ' -+ 'SSHv1, this is no longer supported in Anolis 8. ' - 'Otherwise this option can be simply removed.' - ), - reporting.Severity(reporting.Severity.LOW), -diff --git a/repos/system_upgrade/el7toel8/actors/opensshuseprivilegeseparationcheck/libraries/opensshuseprivilegeseparationcheck.py b/repos/system_upgrade/el7toel8/actors/opensshuseprivilegeseparationcheck/libraries/opensshuseprivilegeseparationcheck.py -index 64de878..ab5660c 100644 ---- a/repos/system_upgrade/el7toel8/actors/opensshuseprivilegeseparationcheck/libraries/opensshuseprivilegeseparationcheck.py -+++ b/repos/system_upgrade/el7toel8/actors/opensshuseprivilegeseparationcheck/libraries/opensshuseprivilegeseparationcheck.py -@@ -19,7 +19,7 @@ def process(openssh_messages): - reporting.Summary( - 'OpenSSH is configured to disable privilege ' - 'separation sandbox, which is decreasing security ' -- 'and is no longer supported in RHEL 8' -+ 'and is no longer supported in Anolis 8' - ), - reporting.Severity(reporting.Severity.LOW), - reporting.Tags([ -diff --git a/repos/system_upgrade/el7toel8/actors/persistentnetnamesconfig/actor.py b/repos/system_upgrade/el7toel8/actors/persistentnetnamesconfig/actor.py -index 39889b3..7f746a9 100644 ---- a/repos/system_upgrade/el7toel8/actors/persistentnetnamesconfig/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/persistentnetnamesconfig/actor.py -@@ -14,8 +14,8 @@ class PersistentNetNamesConfig(Actor): - Generate udev persistent network naming configuration - - This actor generates systemd-udevd link files for each physical ethernet interface present on RHEL-7 -- in case we notice that interace name differs on RHEL-8. Link file configuration will assign RHEL-7 version of -- a name. Actors produces list of interfaces which changed name between RHEL-7 and RHEL-8. -+ in case we notice that interace name differs on Anolis-8. Link file configuration will assign RHEL-7 version of -+ a name. Actors produces list of interfaces which changed name between RHEL-7 and Anolis-8. - """ - - name = 'persistentnetnamesconfig' -diff --git a/repos/system_upgrade/el7toel8/actors/persistentnetnamesconfig/libraries/persistentnetnamesconfig.py b/repos/system_upgrade/el7toel8/actors/persistentnetnamesconfig/libraries/persistentnetnamesconfig.py -index 3da4cc2..db0f212 100644 ---- a/repos/system_upgrade/el7toel8/actors/persistentnetnamesconfig/libraries/persistentnetnamesconfig.py -+++ b/repos/system_upgrade/el7toel8/actors/persistentnetnamesconfig/libraries/persistentnetnamesconfig.py -@@ -79,7 +79,7 @@ def process(): - ' could be renamed on the upgraded system.' - ) - # Note(pstodulk): -- # This usually happens when required (RHEL 8 compatible) -+ # This usually happens when required (Anolis 8 compatible) - # drivers are not included in the upgrade initramfs. - # We can add more information later. Currently we cannot provide - # better instructions for users before (at least): -diff --git a/repos/system_upgrade/el7toel8/actors/persistentnetnamesdisable/actor.py b/repos/system_upgrade/el7toel8/actors/persistentnetnamesdisable/actor.py -index a40d406..4e512c1 100644 ---- a/repos/system_upgrade/el7toel8/actors/persistentnetnamesdisable/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/persistentnetnamesdisable/actor.py -@@ -30,7 +30,7 @@ class PersistentNetNamesDisable(Actor): - return len(interfaces) == 1 and interfaces[0].name == 'eth0' - - def disable_persistent_naming(self): -- self.log.info("Single eth0 network interface detected. Appending 'net.ifnames=0' to RHEL-8 kernel commandline") -+ self.log.info("Single eth0 network interface detected. Appending 'net.ifnames=0' to Anolis-8 kernel commandline") - self.produce(KernelCmdlineArg(**{'key': 'net.ifnames', 'value': '0'})) - - def process(self): -diff --git a/repos/system_upgrade/el7toel8/actors/peseventsscanner/libraries/peseventsscanner.py b/repos/system_upgrade/el7toel8/actors/peseventsscanner/libraries/peseventsscanner.py -index 6e09b56..858608d 100644 ---- a/repos/system_upgrade/el7toel8/actors/peseventsscanner/libraries/peseventsscanner.py -+++ b/repos/system_upgrade/el7toel8/actors/peseventsscanner/libraries/peseventsscanner.py -@@ -339,23 +339,23 @@ def process_events(releases, events, installed_pkgs): - for event in release_events: - if is_event_relevant(event, installed_pkgs, tasks): - if event.action in [Action.deprecated, Action.present]: -- # Keep these packages to make sure the repo they're in on RHEL 8 gets enabled -+ # Keep these packages to make sure the repo they're in on Anolis 8 gets enabled - add_packages_to_tasks(current, event.in_pkgs, Task.keep) - - if event.action == Action.moved: -- # Keep these packages to make sure the repo they're in on RHEL 8 gets enabled -+ # Keep these packages to make sure the repo they're in on Anolis 8 gets enabled - # We don't care about the "in_pkgs" as it contains always just one pkg - the same as the "out" pkg - add_packages_to_tasks(current, event.out_pkgs, Task.keep) - - if event.action in [Action.split, Action.merged, Action.renamed, Action.replaced]: - non_installed_out_pkgs = filter_out_installed_pkgs(event.out_pkgs, installed_pkgs) - add_packages_to_tasks(current, non_installed_out_pkgs, Task.install) -- # Keep already installed "out" pkgs to ensure the repo they're in on RHEL 8 gets enabled -+ # Keep already installed "out" pkgs to ensure the repo they're in on Anolis 8 gets enabled - installed_out_pkgs = get_installed_event_pkgs(event.out_pkgs, installed_pkgs) - add_packages_to_tasks(current, installed_out_pkgs, Task.keep) - - if event.action in [Action.split, Action.merged]: -- # Remove those RHEL 7 pkgs that are no longer on RHEL 8 -+ # Remove those RHEL 7 pkgs that are no longer on Anolis 8 - in_pkgs_without_out_pkgs = filter_out_out_pkgs(event.in_pkgs, event.out_pkgs) - add_packages_to_tasks(current, in_pkgs_without_out_pkgs, Task.remove) - -@@ -422,7 +422,7 @@ def get_installed_event_pkgs(event_pkgs, installed_pkgs): - """ - Get those event's "in" or "out" packages which are already installed. - -- Even though we don't want to install the already installed pkgs, to be able to upgrade them to their RHEL 8 version -+ Even though we don't want to install the already installed pkgs, to be able to upgrade them to their Anolis 8 version - we need to know in which repos they are and enable such repos. - """ - return {k: v for k, v in event_pkgs.items() if k in installed_pkgs} -@@ -441,9 +441,9 @@ def filter_out_out_pkgs(event_in_pkgs, event_out_pkgs): - - SKIPPED_PKGS_MSG = ( - 'packages will be skipped because they are available only in ' -- 'RHEL 8 repositories that are intentionally excluded from the ' -+ 'Anolis 8 repositories that are intentionally excluded from the ' - 'list of repositories used during the upgrade. ' -- 'See the report message titled "Excluded RHEL 8 repositories" ' -+ 'See the report message titled "Excluded Anolis 8 repositories" ' - 'for details.\nThe list of these packages:' - ) - -@@ -564,7 +564,7 @@ def add_output_pkgs_to_transaction_conf(transaction_configuration, events): - on the user configuration files - :param events: List of Event tuples, where each event contains event type and input/output pkgs - """ -- message = 'The following RHEL 8 packages will not be installed:\n' -+ message = 'The following Anolis 8 packages will not be installed:\n' - - for event in events: - if event.action in (Action.split, Action.merged, Action.replaced, Action.renamed): -diff --git a/repos/system_upgrade/el7toel8/actors/pythoninformuser/actor.py b/repos/system_upgrade/el7toel8/actors/pythoninformuser/actor.py -index 34809a4..a64e00a 100644 ---- a/repos/system_upgrade/el7toel8/actors/pythoninformuser/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/pythoninformuser/actor.py -@@ -6,15 +6,15 @@ from leapp.tags import ChecksPhaseTag, IPUWorkflowTag - - class PythonInformUser(Actor): - name = "python_inform_user" -- description = "This actor informs the user of differences in Python version and support in RHEL 8." -+ description = "This actor informs the user of differences in Python version and support in Anolis 8." - consumes = () - produces = (Report,) - tags = (ChecksPhaseTag, IPUWorkflowTag) - - def process(self): - url = "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/configuring_basic_system_settings/#using-python3" # noqa: E501; pylint: disable=line-too-long -- title = "Difference in Python versions and support in RHEL 8" -- summary = ("In RHEL 8, there is no 'python' command." -+ title = "Difference in Python versions and support in Anolis 8" -+ summary = ("In Anolis 8, there is no 'python' command." - " Python 3 (backward incompatible) is the primary Python version" - " and Python 2 is available with limited support and limited set of packages." - " Read more here: {}".format(url)) -diff --git a/repos/system_upgrade/el7toel8/actors/quaggareport/actor.py b/repos/system_upgrade/el7toel8/actors/quaggareport/actor.py -index 5397904..3b930cf 100644 ---- a/repos/system_upgrade/el7toel8/actors/quaggareport/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/quaggareport/actor.py -@@ -15,7 +15,7 @@ class QuaggaReport(Actor): - Checking for babeld on RHEL-7. - - This actor is supposed to report that babeld was used on RHEL-7 -- and it is no longer available in RHEL-8. -+ and it is no longer available in Anolis-8. - """ - - name = 'quagga_report' -@@ -36,10 +36,10 @@ class QuaggaReport(Actor): - 'documentation/en-us/red_hat_enterprise_linux/8/html/' - 'configuring_and_managing_networking/setting-your-rou' - 'ting-protocols_configuring-and-managing-networking', -- title='Setting routing protocols in RHEL8'), -+ title='Setting routing protocols in Anolis8'), - reporting.Summary( - 'babeld daemon which was a part of quagga implementation in RHEL7 ' -- 'is not available in RHEL8 in FRR due to licensing issues.' -+ 'is not available in Anolis8 in FRR due to licensing issues.' - ), - reporting.Severity(reporting.Severity.HIGH), - reporting.Tags(COMMON_REPORT_TAGS), -diff --git a/repos/system_upgrade/el7toel8/actors/quaggatofrr/actor.py b/repos/system_upgrade/el7toel8/actors/quaggatofrr/actor.py -index 5623cd4..212b5b5 100644 ---- a/repos/system_upgrade/el7toel8/actors/quaggatofrr/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/quaggatofrr/actor.py -@@ -8,7 +8,7 @@ class QuaggaToFrr(Actor): - """ - Edit frr configuration on the new system. - -- Take gathered info about quagga from RHEL 7 and apply these to frr in RHEL 8. -+ Take gathered info about quagga from RHEL 7 and apply these to frr in Anolis 8. - """ - - name = 'quagga_to_frr' -diff --git a/repos/system_upgrade/el7toel8/actors/removeleftoverpackages/actor.py b/repos/system_upgrade/el7toel8/actors/removeleftoverpackages/actor.py -index 774d947..b01599a 100644 ---- a/repos/system_upgrade/el7toel8/actors/removeleftoverpackages/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/removeleftoverpackages/actor.py -@@ -9,7 +9,7 @@ from leapp.tags import RPMUpgradePhaseTag, IPUWorkflowTag, ExperimentalTag - - class RemoveLeftoverPackages(Actor): - """ -- Remove el7 packages left on the system after the upgrade to RHEL 8. -+ Remove el7 packages left on the system after the upgrade to Anolis 8. - - Removal of el7 packages is necessary in order to keep the machine in supported state. - Actor generates report telling users what packages have been removed. -diff --git a/repos/system_upgrade/el7toel8/actors/removeoldpammodulesapply/actor.py b/repos/system_upgrade/el7toel8/actors/removeoldpammodulesapply/actor.py -index cda33e1..60f6761 100644 ---- a/repos/system_upgrade/el7toel8/actors/removeoldpammodulesapply/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/removeoldpammodulesapply/actor.py -@@ -7,7 +7,7 @@ from leapp.tags import IPUWorkflowTag, PreparationPhaseTag - - class RemoveOldPAMModulesApply(Actor): - """ -- Remove old PAM modules that are no longer available in RHEL-8 from -+ Remove old PAM modules that are no longer available in Anolis8 from - PAM configuration to avoid system lock out. - """ - -diff --git a/repos/system_upgrade/el7toel8/actors/removeoldpammodulescheck/actor.py b/repos/system_upgrade/el7toel8/actors/removeoldpammodulescheck/actor.py -index e9ca9aa..0a7768d 100644 ---- a/repos/system_upgrade/el7toel8/actors/removeoldpammodulescheck/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/removeoldpammodulescheck/actor.py -@@ -9,7 +9,7 @@ from leapp.tags import IPUWorkflowTag, ChecksPhaseTag - - class RemoveOldPAMModulesCheck(Actor): - """ -- Check if it is all right to disable PAM modules that are not in RHEL-8. -+ Check if it is all right to disable PAM modules that are not in Anolis-8. - - If admin will refuse to disable these modules (pam_pkcs11 and pam_krb5), - upgrade will be stopped. Otherwise we would risk locking out the system -@@ -29,7 +29,7 @@ class RemoveOldPAMModulesCheck(Actor): - label='Disable pam_pkcs11 module in PAM configuration? ' - 'If no, the upgrade process will be interrupted.', - description='PAM module pam_pkcs11 is no longer available ' -- 'in RHEL-8 since it was replaced by SSSD.', -+ 'in Anolis-8 since it was replaced by SSSD.', - reason='Leaving this module in PAM configuration may ' - 'lock out the system.' - ), -@@ -44,7 +44,7 @@ class RemoveOldPAMModulesCheck(Actor): - label='Disable pam_krb5 module in PAM configuration? ' - 'If no, the upgrade process will be interrupted.', - description='PAM module pam_krb5 is no longer available ' -- 'in RHEL-8 since it was replaced by SSSD.', -+ 'in Anolis-8 since it was replaced by SSSD.', - reason='Leaving this module in PAM configuration may ' - 'lock out the system.' - ), -@@ -78,9 +78,9 @@ class RemoveOldPAMModulesCheck(Actor): - reporting.Title('Module {0} will be removed from PAM configuration'.format(module)), - reporting.Summary( - 'Module {0} was surpassed by SSSD and therefore it was ' -- 'removed from RHEL-8. Keeping it in PAM configuration may ' -+ 'removed from Anolis-8. Keeping it in PAM configuration may ' - 'lock out the system thus it will be automatically removed ' -- 'from PAM configuration before upgrading to RHEL-8. ' -+ 'from PAM configuration before upgrading to Anolis-8. ' - 'Please switch to SSSD to recover the functionality ' - 'of {0}.'.format(module) - ), -@@ -102,7 +102,7 @@ class RemoveOldPAMModulesCheck(Actor): - 'automatically.'.format(module)), - reporting.Summary( - 'Module {0} was surpassed by SSSD and therefore it was ' -- 'removed from RHEL-8. Keeping it in PAM configuration may ' -+ 'removed from Anolis-8. Keeping it in PAM configuration may ' - 'lock out the system thus it is necessary to disable it ' - 'before the upgrade process can continue.'.format(module) - ), -diff --git a/repos/system_upgrade/el7toel8/actors/removeoldpammodulesscanner/actor.py b/repos/system_upgrade/el7toel8/actors/removeoldpammodulesscanner/actor.py -index d22dd31..06c1a44 100644 ---- a/repos/system_upgrade/el7toel8/actors/removeoldpammodulesscanner/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/removeoldpammodulesscanner/actor.py -@@ -7,9 +7,9 @@ from leapp.tags import FactsPhaseTag, IPUWorkflowTag - - class RemoveOldPAMModulesScanner(Actor): - """ -- Scan PAM configuration for modules that are not available in RHEL-8. -+ Scan PAM configuration for modules that are not available in Anolis-8. - -- PAM module pam_krb5 and pam_pkcs11 are no longer present in RHEL-8 -+ PAM module pam_krb5 and pam_pkcs11 are no longer present in Anolis-8 - and must be removed from PAM configuration, otherwise it may lock out - the system. - """ -diff --git a/repos/system_upgrade/el7toel8/actors/removeoldpammodulesscanner/libraries/removeoldpammodulesscanner.py b/repos/system_upgrade/el7toel8/actors/removeoldpammodulesscanner/libraries/removeoldpammodulesscanner.py -index 8b133f5..21daa0c 100644 ---- a/repos/system_upgrade/el7toel8/actors/removeoldpammodulesscanner/libraries/removeoldpammodulesscanner.py -+++ b/repos/system_upgrade/el7toel8/actors/removeoldpammodulesscanner/libraries/removeoldpammodulesscanner.py -@@ -3,9 +3,9 @@ from leapp.models import RemovedPAMModules - - class RemoveOldPAMModulesScannerLibrary(object): - """ -- Scan PAM configuration for modules that are not available in RHEL-8. -+ Scan PAM configuration for modules that are not available in Anolis-8. - -- PAM module pam_krb5 and pam_pkcs11 are no longer present in RHEL-8 -+ PAM module pam_krb5 and pam_pkcs11 are no longer present in Anolis-8 - and must be removed from PAM configuration, otherwise it may lock out - the system. - """ -diff --git a/repos/system_upgrade/el7toel8/actors/reportsettargetrelease/libraries/reportsettargetrelease.py b/repos/system_upgrade/el7toel8/actors/reportsettargetrelease/libraries/reportsettargetrelease.py -index 815fe7d..faed27d 100644 ---- a/repos/system_upgrade/el7toel8/actors/reportsettargetrelease/libraries/reportsettargetrelease.py -+++ b/repos/system_upgrade/el7toel8/actors/reportsettargetrelease/libraries/reportsettargetrelease.py -@@ -15,7 +15,7 @@ def _report_set_release(): - ), - reporting.Severity(reporting.Severity.LOW), - reporting.Remediation( -- hint='If you wish to receive updates for the latest released version of RHEL 8, run `subscription-manager' -+ hint='If you wish to receive updates for the latest released version of Anolis 8, run `subscription-manager' - ' release --unset` after the upgrade.'), - reporting.Tags([reporting.Tags.UPGRADE_PROCESS]), - reporting.RelatedResource('package', 'subscription-manager') -@@ -36,7 +36,7 @@ def _report_unhandled_release(): - 'The upgrade is executed with the --no-rhsm option (or with' - ' the LEAPP_NO_RHSM environment variable). In this case, the subscription-manager' - ' will not be configured during the upgrade. If the system is subscribed and release' -- ' is set already, you could encounter issues to get RHEL 8 content using DNF/YUM' -+ ' is set already, you could encounter issues to get Anolis 8 content using DNF/YUM' - ' after the upgrade.' - ), - reporting.Severity(reporting.Severity.LOW), -diff --git a/repos/system_upgrade/el7toel8/actors/repositoriesblacklist/libraries/repositoriesblacklist.py b/repos/system_upgrade/el7toel8/actors/repositoriesblacklist/libraries/repositoriesblacklist.py -index 5713529..ec4949c 100644 ---- a/repos/system_upgrade/el7toel8/actors/repositoriesblacklist/libraries/repositoriesblacklist.py -+++ b/repos/system_upgrade/el7toel8/actors/repositoriesblacklist/libraries/repositoriesblacklist.py -@@ -21,7 +21,7 @@ def _get_list_of_optional_repos(): - Return a dict of optional repositories based on RepositoriesMap: { 'from_repoid' : 'to_repoid'} - - It consumes RepositoriesMap messages and create map (dict) of optional repositories -- on RHEL 7 system to CRB repositories on RHEL 8. See the RepositoriesMap model.. -+ on RHEL 7 system to CRB repositories on Anolis 8. See the RepositoriesMap model.. - """ - opt_repo = {} - repo_map = next(api.consume(RepositoriesMap), None) -@@ -54,7 +54,7 @@ def process(): - api.produce(RepositoriesBlacklisted(repoids=reposid_blacklist)) - - report = [ -- reporting.Title("Excluded RHEL 8 repositories"), -+ reporting.Title("Excluded Anolis 8 repositories"), - reporting.Summary( - "The following repositories are not supported by " - "Red Hat and are excluded from the list of repositories " -diff --git a/repos/system_upgrade/el7toel8/actors/scaninstalledtargetkernelversion/libraries/scankernel.py b/repos/system_upgrade/el7toel8/actors/scaninstalledtargetkernelversion/libraries/scankernel.py -index 954f250..594d536 100644 ---- a/repos/system_upgrade/el7toel8/actors/scaninstalledtargetkernelversion/libraries/scankernel.py -+++ b/repos/system_upgrade/el7toel8/actors/scaninstalledtargetkernelversion/libraries/scankernel.py -@@ -31,7 +31,7 @@ def process(): - return - else: - api.current_logger().warning( -- 'The kernel-rt rpm from RHEL 8 has not been detected. Switching to non-preemptive kernel.') -+ 'The kernel-rt rpm from Anolis 8 has not been detected. Switching to non-preemptive kernel.') - # TODO: create report with instructions to install kernel-rt manually - # - attach link to article if any - # - this possibly happens just in case the repository with kernel-rt -@@ -48,4 +48,4 @@ def process(): - # behaviour in this case, but at least the let me log the error msg - # - api.current_logger().error('Cannot detect any kernel RPM') -- # StopActorExecutionError('Cannot detect any RHEL 8 kernel RPM.') -+ # StopActorExecutionError('Cannot detect any Anolis 8 kernel RPM.') -diff --git a/repos/system_upgrade/el7toel8/actors/sctpconfigread/actor.py b/repos/system_upgrade/el7toel8/actors/sctpconfigread/actor.py -index 452f5c6..7f96ec6 100644 ---- a/repos/system_upgrade/el7toel8/actors/sctpconfigread/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/sctpconfigread/actor.py -@@ -10,7 +10,7 @@ class SCTPConfigRead(Actor): - - This actor determines whether or not the SCTP is currently used by this machine or has been quite - recently used (1 month timeframe). In case it has been used it will issue a SCTPConfig message that -- defines the decision whether or not the SCTP module should be removed from the module blacklist on RHEL8. -+ defines the decision whether or not the SCTP module should be removed from the module blacklist on Anolis8. - """ - name = 'sctp_read_status' - consumes = (ActiveKernelModulesFacts,) -diff --git a/repos/system_upgrade/el7toel8/actors/sctpconfigupdate/actor.py b/repos/system_upgrade/el7toel8/actors/sctpconfigupdate/actor.py -index ee177d9..b6628b5 100644 ---- a/repos/system_upgrade/el7toel8/actors/sctpconfigupdate/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/sctpconfigupdate/actor.py -@@ -8,11 +8,11 @@ class SCTPConfigUpdate(Actor): - """ - Updates the kernel module blacklist for SCTP. - -- If the SCTP module is wanted on RHEL8 the modprobe configuration gets updated to remove SCTP from the black listed -+ If the SCTP module is wanted on Anolis8 the modprobe configuration gets updated to remove SCTP from the black listed - kernel modules. - """ - name = 'sctp_config_update' -- description = 'This actor updates SCTP configuration for RHEL8.' -+ description = 'This actor updates SCTP configuration for Anolis8.' - consumes = (SCTPConfig,) - produces = () - tags = (ApplicationsPhaseTag, IPUWorkflowTag) -diff --git a/repos/system_upgrade/el7toel8/actors/selinux/selinuxapplycustom/actor.py b/repos/system_upgrade/el7toel8/actors/selinux/selinuxapplycustom/actor.py -index a18800e..7e201d8 100644 ---- a/repos/system_upgrade/el7toel8/actors/selinux/selinuxapplycustom/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/selinux/selinuxapplycustom/actor.py -@@ -15,7 +15,7 @@ class SELinuxApplyCustom(Actor): - Re-apply SELinux customizations from RHEL-7 installation - - Re-apply SELinux policy customizations (custom policy modules and changes -- introduced by semanage). Any changes (due to incompatiblity with RHEL-8 -+ introduced by semanage). Any changes (due to incompatiblity with Anolis-8 - SELinux policy) are reported to user. - """ - name = 'selinuxapplycustom' -diff --git a/repos/system_upgrade/el7toel8/actors/selinux/selinuxcontentscanner/actor.py b/repos/system_upgrade/el7toel8/actors/selinux/selinuxcontentscanner/actor.py -index 23e0079..73d0211 100644 ---- a/repos/system_upgrade/el7toel8/actors/selinux/selinuxcontentscanner/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/selinux/selinuxcontentscanner/actor.py -@@ -10,7 +10,7 @@ class SELinuxContentScanner(Actor): - - Find SELinux policy customizations (custom policy modules and changes - introduced by semanage) and save them in SELinuxModules and SELinuxCustom -- models. Customizations that are incompatible with SELinux policy on RHEL-8 -+ models. Customizations that are incompatible with SELinux policy on Anolis-8 - are removed. - """ - -diff --git a/repos/system_upgrade/el7toel8/actors/selinux/selinuxcontentscanner/libraries/selinuxcontentscanner.py b/repos/system_upgrade/el7toel8/actors/selinux/selinuxcontentscanner/libraries/selinuxcontentscanner.py -index 202fd89..3aed415 100644 ---- a/repos/system_upgrade/el7toel8/actors/selinux/selinuxcontentscanner/libraries/selinuxcontentscanner.py -+++ b/repos/system_upgrade/el7toel8/actors/selinux/selinuxcontentscanner/libraries/selinuxcontentscanner.py -@@ -88,7 +88,7 @@ def get_selinux_modules(): - - modules = list_selinux_modules() - semodule_list = [] -- # list of rpms containing policy modules to be installed on RHEL 8 -+ # list of rpms containing policy modules to be installed on Anolis 8 - retain_rpms = [] - install_rpms = [] - -@@ -152,7 +152,7 @@ def get_selinux_modules(): - except CalledProcessError: - pass - # Check if modules contain any type, attribute, or boolean contained in container-selinux and install it if so -- # This is necessary since container policy module is part of selinux-policy-targeted in RHEL 7 (but not in RHEL 8) -+ # This is necessary since container policy module is part of selinux-policy-targeted in RHEL 7 (but not in Anolis 8) - try: - run(['grep', '-w', '-r', '-E', "|".join(CONTAINER_TYPES)], split=False) - # Request "container-selinux" to be installed since container types where used in local customizations -@@ -177,7 +177,7 @@ def get_selinux_customizations(): - - Returns tuple (semanage_valid, semanage_removed) - where "semanage_valid" is a list of semanage commands -- which should be safe to re-apply on RHEL 8 system -+ which should be safe to re-apply on Anolis 8 system - and "semanage_removed" is a list of commands that - will no longer be valid after system upgrade - """ -diff --git a/repos/system_upgrade/el7toel8/actors/spamassassinconfigcheck/actor.py b/repos/system_upgrade/el7toel8/actors/spamassassinconfigcheck/actor.py -index 3fdb27f..e7501a1 100644 ---- a/repos/system_upgrade/el7toel8/actors/spamassassinconfigcheck/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/spamassassinconfigcheck/actor.py -@@ -6,10 +6,10 @@ from leapp.tags import ChecksPhaseTag, IPUWorkflowTag - - class SpamassassinConfigCheck(Actor): - """ -- Reports changes in spamassassin between RHEL-7 and RHEL-8 -+ Reports changes in spamassassin between RHEL-7 and Anolis-8 - - Reports backward-incompatible changes that have been made in spamassassin -- between RHEL-7 and RHEL-8 (spamc no longer accepts an argument with the --ssl -+ between RHEL-7 and Anolis-8 (spamc no longer accepts an argument with the --ssl - option; spamd no longer accepts the --ssl-version; SSLv3 is no longer supported; - the type of spamassassin.service has been changed from "forking" to "simple"; - sa-update no longer supports SHA1 validation of rule files). -diff --git a/repos/system_upgrade/el7toel8/actors/spamassassinconfigupdate/tests/test_lib_spamd_spamassassinconfigupdate.py b/repos/system_upgrade/el7toel8/actors/spamassassinconfigupdate/tests/test_lib_spamd_spamassassinconfigupdate.py -index 92e042b..3cc826d 100644 ---- a/repos/system_upgrade/el7toel8/actors/spamassassinconfigupdate/tests/test_lib_spamd_spamassassinconfigupdate.py -+++ b/repos/system_upgrade/el7toel8/actors/spamassassinconfigupdate/tests/test_lib_spamd_spamassassinconfigupdate.py -@@ -436,7 +436,7 @@ def test_migrate_spamd_config_no_writes_with_unmodified_config(): - # Test that no writes are performed if the sysconfig file is in its - # default state and thus gets replaced during the RPM upgrade. - facts = SpamassassinFacts(service_overriden=False, spamd_ssl_version='tlsv1') -- # Content of the sysconfig file from RHEL-8 -+ # Content of the sysconfig file from Anolis-8 - content = ('# Options to spamd\n' - 'SPAMDOPTIONS="-c -m5 -H --razor-home-dir=\'/var/lib/razor/\' --razor-log-file=\'sys-syslog\'"\n') - fileops = MockFileOperations() -diff --git a/repos/system_upgrade/el7toel8/actors/sssdcheck/actor.py b/repos/system_upgrade/el7toel8/actors/sssdcheck/actor.py -index 3ae80ea..42d9f7d 100644 ---- a/repos/system_upgrade/el7toel8/actors/sssdcheck/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/sssdcheck/actor.py -@@ -15,7 +15,7 @@ related = [ - - class SSSDCheck(Actor): - """ -- Check SSSD configuration for changes in RHEL8 and report them. -+ Check SSSD configuration for changes in Anolis8 and report them. - - These changes are: - - id_provider=local is no longer supported and will be ignored -diff --git a/repos/system_upgrade/el7toel8/actors/sssdfacts/actor.py b/repos/system_upgrade/el7toel8/actors/sssdfacts/actor.py -index ed54912..af2a44d 100644 ---- a/repos/system_upgrade/el7toel8/actors/sssdfacts/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/sssdfacts/actor.py -@@ -8,7 +8,7 @@ from leapp.tags import IPUWorkflowTag, FactsPhaseTag - - class SSSDFacts(Actor): - """ -- Check SSSD configuration for changes in RHEL8 and report them in model. -+ Check SSSD configuration for changes in Anolis8 and report them in model. - - These changes are: - - id_provider=local is no longer supported and will be ignored -diff --git a/repos/system_upgrade/el7toel8/actors/sssdfacts/libraries/sssdfacts.py b/repos/system_upgrade/el7toel8/actors/sssdfacts/libraries/sssdfacts.py -index 2cfa84d..e479b4d 100644 ---- a/repos/system_upgrade/el7toel8/actors/sssdfacts/libraries/sssdfacts.py -+++ b/repos/system_upgrade/el7toel8/actors/sssdfacts/libraries/sssdfacts.py -@@ -10,7 +10,7 @@ class SSSDFactsLibrary(object): - - def process(self): - """ -- Check SSSD configuration for changes in RHEL8 and return them in SSSDConfig -+ Check SSSD configuration for changes in Anolis8 and return them in SSSDConfig - model. - - These changes are: -diff --git a/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/libraries/userspacegen.py b/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/libraries/userspacegen.py -index b2d40aa..f2d867c 100644 ---- a/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/libraries/userspacegen.py -+++ b/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/libraries/userspacegen.py -@@ -137,7 +137,7 @@ def prepare_target_userspace(context, userspace_dir, enabled_repos, packages): - context.call(cmd, callback_raw=utils.logging_handler) - except CalledProcessError as exc: - raise StopActorExecutionError( -- message='Unable to install RHEL 8 userspace packages.', -+ message='Unable to install Anolis 8 userspace packages.', - details={'details': str(exc), 'stderr': exc.stderr} - ) - -@@ -288,20 +288,20 @@ def _get_rhsm_available_repoids(context): - # + or check that all required RHEL repo IDs are available. - if rhsm.skip_rhsm(): - return set() -- # Get the RHSM repos available in the RHEL 8 container -+ # Get the RHSM repos available in the Anolis 8 container - # TODO: very similar thing should happens for all other repofiles in container - # - repoids = rhsm.get_available_repo_ids(context) - if not repoids or len(repoids) < 2: - raise StopActorExecutionError( -- message='Cannot find required basic RHEL 8 repositories.', -+ message='Cannot find required basic Anolis 8 repositories.', - details={ - 'hint': ('It is required to have RHEL repositories on the system' - ' provided by the subscription-manager unless the --no-rhsm' - ' options is specified. Possibly you' - ' are missing a valid SKU for the target system or network' - ' connection failed. Check whether your system is attached' -- ' to a valid SKU providing RHEL 8 repositories.' -+ ' to a valid SKU providing Anolis 8 repositories.' - ' In case the Satellite is used, read the upgrade documentation' - ' to setup the satellite and the system properly.') - } -diff --git a/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py b/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py -index 41bd103..e9d8cd9 100644 ---- a/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py -+++ b/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py -@@ -220,7 +220,7 @@ def test_gather_target_repositories_none_available(monkeypatch): - monkeypatch.setattr(rhsm, 'skip_rhsm', lambda: False) - with pytest.raises(StopActorExecutionError) as err: - userspacegen.gather_target_repositories(None, None) -- assert "Cannot find required basic RHEL 8 repositories" in str(err) -+ assert "Cannot find required basic Anolis 8 repositories" in str(err) - - - def test_gather_target_repositories_rhui(monkeypatch): -@@ -266,7 +266,7 @@ def test_gather_target_repositories_required_not_available(monkeypatch): - - with pytest.raises(StopActorExecutionError) as err: - userspacegen.gather_target_repositories(None) -- assert "Cannot find required basic RHEL 8 repositories" in str(err) -+ assert "Cannot find required basic Anolis 8 repositories" in str(err) - - - def mocked_consume_data(): -diff --git a/repos/system_upgrade/el7toel8/actors/tcpwrapperscheck/actor.py b/repos/system_upgrade/el7toel8/actors/tcpwrapperscheck/actor.py -index 32ae484..d7d7331 100644 ---- a/repos/system_upgrade/el7toel8/actors/tcpwrapperscheck/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/tcpwrapperscheck/actor.py -@@ -62,7 +62,7 @@ class TcpWrappersCheck(Actor): - create_report([ - reporting.Title('TCP Wrappers configuration affects some installed packages'), - reporting.Summary( -- 'tcp_wrappers support has been removed in RHEL-8. ' -+ 'tcp_wrappers support has been removed in Anolis 8. ' - 'There is some configuration affecting installed packages (namely {}) ' - 'in /etc/hosts.deny or /etc/hosts.allow, which ' - 'is no longer going to be effective after update. ' -@@ -70,7 +70,7 @@ class TcpWrappersCheck(Actor): - ), - reporting.Severity(reporting.Severity.HIGH), - reporting.ExternalLink( -- title='Replacing TCP Wrappers in RHEL 8', -+ title='Replacing TCP Wrappers in Anolis 8', - url='https://access.redhat.com/solutions/3906701' - ), - reporting.Tags([reporting.Tags.SECURITY, reporting.Tags.NETWORK]), -diff --git a/repos/system_upgrade/el7toel8/actors/updategrubcore/libraries/updategrubcore.py b/repos/system_upgrade/el7toel8/actors/updategrubcore/libraries/updategrubcore.py -index 23146d0..6e3726b 100644 ---- a/repos/system_upgrade/el7toel8/actors/updategrubcore/libraries/updategrubcore.py -+++ b/repos/system_upgrade/el7toel8/actors/updategrubcore/libraries/updategrubcore.py -@@ -5,7 +5,7 @@ from leapp import reporting - - def update_grub_core(grub_dev): - """ -- Update GRUB core after upgrade from RHEL7 to RHEL8 -+ Update GRUB core after upgrade from RHEL7 to Anolis8 - - On legacy systems, GRUB core does not get automatically updated when GRUB packages - are updated. -diff --git a/repos/system_upgrade/el7toel8/actors/vsftpdconfigcheck/actor.py b/repos/system_upgrade/el7toel8/actors/vsftpdconfigcheck/actor.py -index 3d188cd..9b47a33 100644 ---- a/repos/system_upgrade/el7toel8/actors/vsftpdconfigcheck/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/vsftpdconfigcheck/actor.py -@@ -7,7 +7,7 @@ from leapp.tags import ChecksPhaseTag, IPUWorkflowTag - - class VsftpdConfigCheck(Actor): - """ -- Checks whether the vsftpd configuration is supported in RHEL-8. Namely checks that -+ Checks whether the vsftpd configuration is supported in Anolis-8. Namely checks that - configuration files don't set tcp_wrappers=YES and vsftpd-related configuration is - not present in tcp_wrappers configuration files at the same time. - """ -diff --git a/repos/system_upgrade/el7toel8/actors/vsftpdconfigcheck/libraries/vsftpdconfigcheck.py b/repos/system_upgrade/el7toel8/actors/vsftpdconfigcheck/libraries/vsftpdconfigcheck.py -index 837d528..a6c307c 100644 ---- a/repos/system_upgrade/el7toel8/actors/vsftpdconfigcheck/libraries/vsftpdconfigcheck.py -+++ b/repos/system_upgrade/el7toel8/actors/vsftpdconfigcheck/libraries/vsftpdconfigcheck.py -@@ -10,7 +10,7 @@ def check_config_supported(tcpwrap_facts, vsftpd_facts): - create_report([ - reporting.Title('Unsupported vsftpd configuration'), - reporting.Summary( -- 'tcp_wrappers support has been removed in RHEL-8. ' -+ 'tcp_wrappers support has been removed in Anolis8. ' - 'Some configuration files set the tcp_wrappers option to true and ' - 'there is some vsftpd-related configuration in /etc/hosts.deny ' - 'or /etc/hosts.allow. Please migrate it manually. ' -@@ -24,7 +24,7 @@ def check_config_supported(tcpwrap_facts, vsftpd_facts): - reporting.Tags([reporting.Tags.SERVICES, reporting.Tags.NETWORK]), - reporting.Flags([reporting.Flags.INHIBITOR]), - reporting.ExternalLink( -- title='Replacing TCP Wrappers in RHEL 8', -+ title='Replacing TCP Wrappers in Anolis 8', - url='https://access.redhat.com/solutions/3906701' - ), - reporting.RelatedResource('package', 'tcp_wrappers'), -diff --git a/repos/system_upgrade/el7toel8/actors/vsftpdconfigupdate/actor.py b/repos/system_upgrade/el7toel8/actors/vsftpdconfigupdate/actor.py -index a3c2d4f..09cb37c 100644 ---- a/repos/system_upgrade/el7toel8/actors/vsftpdconfigupdate/actor.py -+++ b/repos/system_upgrade/el7toel8/actors/vsftpdconfigupdate/actor.py -@@ -6,7 +6,7 @@ from leapp.tags import ApplicationsPhaseTag, IPUWorkflowTag - - class VsftpdConfigUpdate(Actor): - """ -- Modifies vsftpd configuration files on the target RHEL-8 system so that the effective -+ Modifies vsftpd configuration files on the target Anolis-8 system so that the effective - configuration is the same, where possible. This means doing two things: - 1. Reverting the default configuration file (/etc/vsftpd/vsftpd.conf) to its state - before the upgrade (where it makes sense), if the configuration file was being used -diff --git a/repos/system_upgrade/el7toel8/models/authselect.py b/repos/system_upgrade/el7toel8/models/authselect.py -index 5dc5b1c..c093132 100644 ---- a/repos/system_upgrade/el7toel8/models/authselect.py -+++ b/repos/system_upgrade/el7toel8/models/authselect.py -@@ -32,7 +32,7 @@ class AuthselectDecision(Model): - """ - Confirmation of changes suggested in Authselect model. - -- If confirmed is True, the changes will be applied on RHEL-8 machine. -+ If confirmed is True, the changes will be applied on Anolis-8 machine. - """ - topic = SystemInfoTopic - -diff --git a/repos/system_upgrade/el7toel8/models/cpuinfo.py b/repos/system_upgrade/el7toel8/models/cpuinfo.py -index 2a10a80..5b89255 100644 ---- a/repos/system_upgrade/el7toel8/models/cpuinfo.py -+++ b/repos/system_upgrade/el7toel8/models/cpuinfo.py -@@ -21,7 +21,7 @@ class CPUInfo(Model): - Specifies machine type if provided. - - This is important for the check of s390x, whether the HW is supported -- by RHEL 8. -+ by Anolis 8. - """ - - # TODO: regarding possible problems with LOCALE, I am keeping most of -diff --git a/repos/system_upgrade/el7toel8/models/initrdincludes.py b/repos/system_upgrade/el7toel8/models/initrdincludes.py -index cb0f83d..b082ae4 100644 ---- a/repos/system_upgrade/el7toel8/models/initrdincludes.py -+++ b/repos/system_upgrade/el7toel8/models/initrdincludes.py -@@ -4,7 +4,7 @@ from leapp.topics import SystemInfoTopic - - class InitrdIncludes(Model): - """ -- List of files (cannonical filesystem paths) to include in RHEL-8 initrd -+ List of files (cannonical filesystem paths) to include in Anolis-8 initrd - """ - topic = SystemInfoTopic - -diff --git a/repos/system_upgrade/el7toel8/models/kernelcmdlineargs.py b/repos/system_upgrade/el7toel8/models/kernelcmdlineargs.py -index fb3c050..e09f394 100644 ---- a/repos/system_upgrade/el7toel8/models/kernelcmdlineargs.py -+++ b/repos/system_upgrade/el7toel8/models/kernelcmdlineargs.py -@@ -6,7 +6,7 @@ class KernelCmdlineArg(Model): - """ - Single kernel command line parameter with/without a value - -- When produced alone, represents a parameter to include in RHEL-8 kernel cmdline. -+ When produced alone, represents a parameter to include in Anolis-8 kernel cmdline. - """ - topic = SystemInfoTopic - -diff --git a/repos/system_upgrade/el7toel8/models/opensshconfig.py b/repos/system_upgrade/el7toel8/models/opensshconfig.py -index 960df14..049a68f 100644 ---- a/repos/system_upgrade/el7toel8/models/opensshconfig.py -+++ b/repos/system_upgrade/el7toel8/models/opensshconfig.py -@@ -27,9 +27,9 @@ class OpenSshConfig(Model): - use_privilege_separation = fields.Nullable(fields.StringEnum(['sandbox', - 'yes', - 'no'])) -- """ Value of the UsePrivilegeSeparation directive, if present. Removed in RHEL 8. """ -+ """ Value of the UsePrivilegeSeparation directive, if present. Removed in Anolis 8. """ - protocol = fields.Nullable(fields.String()) -- """ Value of the Protocols directive, if present. Removed in RHEL 8. """ -+ """ Value of the Protocols directive, if present. Removed in Anolis 8. """ - ciphers = fields.Nullable(fields.String()) - """ Value of the Ciphers directive, if present. Ciphers separated by comma. """ - macs = fields.Nullable(fields.String()) -diff --git a/repos/system_upgrade/el7toel8/models/removedpammodules.py b/repos/system_upgrade/el7toel8/models/removedpammodules.py -index 3865267..30f002e 100644 ---- a/repos/system_upgrade/el7toel8/models/removedpammodules.py -+++ b/repos/system_upgrade/el7toel8/models/removedpammodules.py -@@ -4,12 +4,12 @@ from leapp.topics import SystemFactsTopic - - class RemovedPAMModules(Model): - """ -- PAM modules that were removed from RHEL8 but are in current configuration. -+ PAM modules that were removed from Anolis8 but are in current configuration. - """ - topic = SystemFactsTopic - - modules = fields.List(fields.String()) - """ - List of PAM modules that were detected in current configuration but -- are no longer available in RHEL8. -+ are no longer available in Anolis8. - """ -diff --git a/repos/system_upgrade/el7toel8/models/repositoriesmap.py b/repos/system_upgrade/el7toel8/models/repositoriesmap.py -index 6194194..acbede6 100644 ---- a/repos/system_upgrade/el7toel8/models/repositoriesmap.py -+++ b/repos/system_upgrade/el7toel8/models/repositoriesmap.py -@@ -15,13 +15,13 @@ class RepositoryMap(Model): - from_repoid = fields.String() - """RHEL 7 repoid as present in the Red Hat CDN""" - to_repoid = fields.String() -- """RHEL 8 repoid as present in the Red Hat CDN""" -+ """Anolis 8 repoid as present in the Red Hat CDN""" - to_pes_repo = fields.String() -- """RHEL 8 repo name as used in the Package Evolution Service database""" -+ """Anolis 8 repo name as used in the Package Evolution Service database""" - from_minor_version = fields.String() - """To which RHEL 7 minor versions the mapping relates to""" - to_minor_version = fields.String() -- """To which RHEL 8 minor versions the mapping relates to""" -+ """To which Anolis 8 minor versions the mapping relates to""" - arch = fields.String() - """CPU architecture the mapping relates to""" - repo_type = fields.StringEnum(choices=['rpm', 'srpm', 'debuginfo']) -@@ -32,4 +32,4 @@ class RepositoriesMap(Model): - topic = TransactionTopic - - repositories = fields.List(fields.Model(RepositoryMap), default=[]) -- """List of RHEL 7 repo <-> RHEL 8 repo mappings""" -+ """List of RHEL 7 repo <-> Anolis 8 repo mappings""" -diff --git a/repos/system_upgrade/el7toel8/models/selinux.py b/repos/system_upgrade/el7toel8/models/selinux.py -index 20fb93e..46eb64e 100644 ---- a/repos/system_upgrade/el7toel8/models/selinux.py -+++ b/repos/system_upgrade/el7toel8/models/selinux.py -@@ -8,7 +8,7 @@ class SELinuxModule(Model): - name = fields.String() - priority = fields.Integer() - content = fields.String() -- # lines removed due to content invalid on RHEL 8 -+ # lines removed due to content invalid on Anolis 8 - removed = fields.List(fields.String()) - - -diff --git a/repos/system_upgrade/el7toel8/workflows/inplace_upgrade.py b/repos/system_upgrade/el7toel8/workflows/inplace_upgrade.py -index 042ccbe..8e48d8c 100644 ---- a/repos/system_upgrade/el7toel8/workflows/inplace_upgrade.py -+++ b/repos/system_upgrade/el7toel8/workflows/inplace_upgrade.py -@@ -14,7 +14,7 @@ class IPUWorkflow(Workflow): - tag = tags.IPUWorkflowTag - short_name = 'ipu' - configuration = IPUConfig -- description = """The IPU workflow takes care of an in-place upgrade (IPU) of RHEL 7 to RHEL 8.""" -+ description = """The IPU workflow takes care of an in-place upgrade (IPU) of RHEL 7 to Anolis 8.""" - - class FactsCollectionPhase(Phase): - """ --- -2.29.2 - diff --git a/0005-remove-rhsm-related-settings-after-upgrade.patch b/0005-remove-rhsm-related-settings-after-upgrade.patch deleted file mode 100644 index 3a3bbc2..0000000 --- a/0005-remove-rhsm-related-settings-after-upgrade.patch +++ /dev/null @@ -1,495 +0,0 @@ -From 689703e8853347e8644532b6e4d728197ed1930c Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Wed, 16 Jun 2021 16:30:44 +0800 -Subject: [PATCH 1/3] remove rhsm related settings after upgrade - -Signed-off-by: Chunmei Xu ---- - .../el7toel8/actors/checkrhsmsku/actor.py | 22 --- - .../checkrhsmsku/libraries/checkrhsmsku.py | 30 ----- - .../tests/test_rhsmsku_checkrhsmsku.py | 40 ------ - .../actors/enablerhsmreposonrhel8/actor.py | 29 ---- - .../libraries/enablerhsmreposonrhel8.py | 59 -------- - .../tests/test_enablerhsmreposonrhel8.py | 127 ------------------ - .../actors/reportsettargetrelease/actor.py | 23 ---- - .../libraries/reportsettargetrelease.py | 53 -------- - ...getreleasereport_reportsettargetrelease.py | 28 ---- - 9 files changed, 411 deletions(-) - delete mode 100644 repos/system_upgrade/el7toel8/actors/checkrhsmsku/actor.py - delete mode 100644 repos/system_upgrade/el7toel8/actors/checkrhsmsku/libraries/checkrhsmsku.py - delete mode 100644 repos/system_upgrade/el7toel8/actors/checkrhsmsku/tests/test_rhsmsku_checkrhsmsku.py - delete mode 100644 repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/actor.py - delete mode 100644 repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/libraries/enablerhsmreposonrhel8.py - delete mode 100644 repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/tests/test_enablerhsmreposonrhel8.py - delete mode 100644 repos/system_upgrade/el7toel8/actors/reportsettargetrelease/actor.py - delete mode 100644 repos/system_upgrade/el7toel8/actors/reportsettargetrelease/libraries/reportsettargetrelease.py - delete mode 100644 repos/system_upgrade/el7toel8/actors/reportsettargetrelease/tests/test_targetreleasereport_reportsettargetrelease.py - -diff --git a/repos/system_upgrade/el7toel8/actors/checkrhsmsku/actor.py b/repos/system_upgrade/el7toel8/actors/checkrhsmsku/actor.py -deleted file mode 100644 -index de571c1..0000000 ---- a/repos/system_upgrade/el7toel8/actors/checkrhsmsku/actor.py -+++ /dev/null -@@ -1,22 +0,0 @@ --from leapp.actors import Actor --from leapp.libraries.actor import checkrhsmsku --from leapp.models import Report, RHSMInfo --from leapp.tags import IPUWorkflowTag, ChecksPhaseTag -- -- --class CheckRedHatSubscriptionManagerSKU(Actor): -- """ -- Ensure the system is subscribed to the subscription manager -- -- This actor verifies that the system is correctly subscribed to via the Red Hat Subscription Manager and -- has attached SKUs. The actor will inhibit the upgrade if there are none and RHSM is not supposed -- to be skipped. -- """ -- -- name = 'check_rhsmsku' -- consumes = (RHSMInfo,) -- produces = (Report,) -- tags = (IPUWorkflowTag, ChecksPhaseTag) -- -- def process(self): -- checkrhsmsku.process() -diff --git a/repos/system_upgrade/el7toel8/actors/checkrhsmsku/libraries/checkrhsmsku.py b/repos/system_upgrade/el7toel8/actors/checkrhsmsku/libraries/checkrhsmsku.py -deleted file mode 100644 -index a41bbe9..0000000 ---- a/repos/system_upgrade/el7toel8/actors/checkrhsmsku/libraries/checkrhsmsku.py -+++ /dev/null -@@ -1,30 +0,0 @@ --from leapp import reporting --from leapp.libraries.common import rhsm --from leapp.libraries.stdlib import api --from leapp.models import RHSMInfo --from leapp.reporting import create_report -- -- --SCA_TEXT = "Content Access Mode is set to Simple Content Access" -- -- --def process(): -- if not rhsm.skip_rhsm(): -- for info in api.consume(RHSMInfo): -- if not info.attached_skus and not info.sca_detected: -- create_report([ -- reporting.Title('The system is not registered or subscribed.'), -- reporting.Summary( -- 'The system has to be registered and subscribed to be able to proceed' -- ' with the upgrade, unless the --no-rhsm option is specified when' -- ' executing leapp.' -- ), -- reporting.Severity(reporting.Severity.HIGH), -- reporting.Tags([reporting.Tags.SANITY]), -- reporting.Flags([reporting.Flags.INHIBITOR]), -- reporting.Remediation( -- hint='Register your system with the subscription-manager tool and attach' -- ' proper SKUs to be able to proceed the upgrade or use the --no-rhsm' -- ' leapp option if you want to provide target repositories by yourself.'), -- reporting.RelatedResource('package', 'subscription-manager') -- ]) -diff --git a/repos/system_upgrade/el7toel8/actors/checkrhsmsku/tests/test_rhsmsku_checkrhsmsku.py b/repos/system_upgrade/el7toel8/actors/checkrhsmsku/tests/test_rhsmsku_checkrhsmsku.py -deleted file mode 100644 -index 7cdf330..0000000 ---- a/repos/system_upgrade/el7toel8/actors/checkrhsmsku/tests/test_rhsmsku_checkrhsmsku.py -+++ /dev/null -@@ -1,40 +0,0 @@ --from leapp.libraries.actor import checkrhsmsku --from leapp.libraries.common import rhsm --from leapp.libraries.common.testutils import create_report_mocked --from leapp.libraries.stdlib import api --from leapp.models import RHSMInfo -- -- --def test_sku_report_skipped(monkeypatch): -- monkeypatch.setattr(rhsm, 'skip_rhsm', lambda: True) -- monkeypatch.setattr(api, 'consume', lambda x: (RHSMInfo(attached_skus=[]),)) -- monkeypatch.setattr(checkrhsmsku, 'create_report', create_report_mocked()) -- checkrhsmsku.process() -- assert not checkrhsmsku.create_report.called -- -- --def test_sku_report_has_skus(monkeypatch): -- monkeypatch.setattr(rhsm, 'skip_rhsm', lambda: False) -- monkeypatch.setattr(api, 'consume', lambda x: (RHSMInfo(attached_skus=['testing-sku']),)) -- monkeypatch.setattr(checkrhsmsku, 'create_report', create_report_mocked()) -- checkrhsmsku.process() -- assert not checkrhsmsku.create_report.called -- -- --def test_sku_report_has_no_skus(monkeypatch): -- monkeypatch.setattr(rhsm, 'skip_rhsm', lambda: False) -- monkeypatch.setattr(api, 'consume', lambda x: (RHSMInfo(attached_skus=[]),)) -- monkeypatch.setattr(checkrhsmsku, 'create_report', create_report_mocked()) -- checkrhsmsku.process() -- assert checkrhsmsku.create_report.called == 1 -- assert checkrhsmsku.create_report.report_fields['title'] == 'The system is not registered or subscribed.' -- assert checkrhsmsku.create_report.report_fields['severity'] == 'high' -- assert 'inhibitor' in checkrhsmsku.create_report.report_fields['flags'] -- -- --def test_sku_report_has_sca(monkeypatch): -- monkeypatch.setattr(rhsm, 'skip_rhsm', lambda: False) -- monkeypatch.setattr(api, 'consume', lambda x: (RHSMInfo(attached_skus=[], sca_detected=True),)) -- monkeypatch.setattr(checkrhsmsku, 'create_report', create_report_mocked()) -- checkrhsmsku.process() -- assert not checkrhsmsku.create_report.called -diff --git a/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/actor.py b/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/actor.py -deleted file mode 100644 -index 06d6e67..0000000 ---- a/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/actor.py -+++ /dev/null -@@ -1,29 +0,0 @@ --from leapp.actors import Actor --from leapp.libraries.actor import enablerhsmreposonrhel8 --from leapp.models import UsedTargetRepositories --from leapp.tags import FirstBootPhaseTag, IPUWorkflowTag -- -- --class EnableRHSMReposOnRHEL8(Actor): -- """ -- On the upgraded Anolis 8, set release and enable repositories that were used during the upgrade transaction. -- -- We are enabling those Anolis 8 repos that are equivalent to the enabled Anolis 7 ones available. The BaseOS and -- AppStream repos are enabled on Anolis 8 by default. Any other repository needs to be enabled specifically using -- the subscription-manager (RHSM) utility. In case some custom repo was used during the upgrade transaction, -- this won't be enabled by this actors as it is unknown to the subscription-manager. -- -- We need to overwrite any RHSM release that may have been set before the upgrade, e.g. 7.6. Reasons: -- - If we leave the old RHEL 7 release set, dnf calls on the upgraded Anolis 8 would fail. -- - If we merely unset the release, users might end up updating the system to a newer version than the upgrade -- was supposed to be upgrading to. -- """ -- -- name = 'enable_rhsm_repos_on_rhel8' -- consumes = (UsedTargetRepositories,) -- produces = () -- tags = (IPUWorkflowTag, FirstBootPhaseTag) -- -- def process(self): -- enablerhsmreposonrhel8.set_rhsm_release() -- enablerhsmreposonrhel8.enable_rhsm_repos() -diff --git a/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/libraries/enablerhsmreposonrhel8.py b/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/libraries/enablerhsmreposonrhel8.py -deleted file mode 100644 -index fc71ae9..0000000 ---- a/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/libraries/enablerhsmreposonrhel8.py -+++ /dev/null -@@ -1,59 +0,0 @@ --from leapp.libraries.common import config, mounting, rhsm --from leapp.libraries.stdlib import CalledProcessError, api, run --from leapp.models import UsedTargetRepositories -- -- --def set_rhsm_release(): -- """Set the RHSM release to the target Anolis 8 minor version.""" -- if rhsm.skip_rhsm(): -- api.current_logger().debug('Skipping setting the RHSM release due to --no-rhsm or environment variables.') -- return -- -- if config.get_product_type('target') != 'ga': -- api.current_logger().debug('Skipping setting the RHSM release as target product is set to beta/htb') -- return -- target_version = api.current_actor().configuration.version.target -- try: -- rhsm.set_release(mounting.NotIsolatedActions(base_dir='/'), target_version) -- except CalledProcessError as err: -- api.current_logger().warning('Unable to set the {0} release through subscription-manager. When using dnf,' -- ' content of the latest Anolis 8 minor version will be downloaded.\n{1}' -- .format(target_version, str(err))) -- -- --def enable_rhsm_repos(): -- """ -- Try enabling all the Anolis 8 repositories that have been used for the upgrade transaction. -- -- In case of custom repositories, the subscription-manager reports an error that it doesn't know them, but it enables -- the known repositories. -- """ -- if rhsm.skip_rhsm(): -- api.current_logger().debug('Skipping enabling repositories through subscription-manager due to --no-rhsm' -- ' or environment variables.') -- return -- try: -- run(get_submgr_cmd(get_repos_to_enable())) -- except CalledProcessError as err: -- api.current_logger().warning('The subscription-manager could not enable some repositories.\n' -- 'It is expected behavior in case of custom repositories unknown to' -- ' the subscription-manager - these need to be enabled manually.\n{0}' -- .format(str(err))) -- -- --def get_submgr_cmd(repos_to_enable): -- submgr_cmd = ['subscription-manager', 'repos'] -- for repoid in repos_to_enable: -- submgr_cmd += ['--enable', repoid] -- return submgr_cmd -- -- --def get_repos_to_enable(): -- """ -- Return set of repositories used during the upgrade transaction. -- -- This set may include repos unknown to subscription-manager - notable those added as custom using -- CustomTargetRepository model. -- """ -- used_repos_msg = next(api.consume(UsedTargetRepositories), None) -- return {repo.repoid for repo in used_repos_msg.repos} -diff --git a/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/tests/test_enablerhsmreposonrhel8.py b/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/tests/test_enablerhsmreposonrhel8.py -deleted file mode 100644 -index fcc0719..0000000 ---- a/repos/system_upgrade/el7toel8/actors/enablerhsmreposonrhel8/tests/test_enablerhsmreposonrhel8.py -+++ /dev/null -@@ -1,127 +0,0 @@ --import sys -- --import pytest -- --from leapp.exceptions import StopActorExecutionError --from leapp.libraries.actor import enablerhsmreposonrhel8 --from leapp.libraries.common import config, mounting, rhsm --from leapp.libraries.common.testutils import CurrentActorMocked, logger_mocked --from leapp.libraries.stdlib import CalledProcessError, api --from leapp.models import EnvVar, UsedTargetRepositories, UsedTargetRepository -- -- --def not_isolated_actions(raise_err=False): -- commands_called = [] -- -- class MockNotIsolatedActions(object): -- def __init__(self, base_dir=None): -- pass -- -- def call(self, cmd, **kwargs): -- commands_called.append((cmd, kwargs)) -- if raise_err: -- raise_call_error() -- -- return (commands_called, MockNotIsolatedActions) -- -- --def raise_call_error(args=None): -- raise CalledProcessError( -- message='A Leapp Command Error occured.', -- command=args, -- result={'signal': None, 'exit_code': 1, 'pid': 0, 'stdout': 'fake', 'stderr': 'fake'} -- ) -- -- --class run_mocked(object): -- def __init__(self, raise_err=False): -- self.called = 0 -- self.args = [] -- self.raise_err = raise_err -- -- def __call__(self, *args): -- self.called += 1 -- self.args.append(args) -- if self.raise_err: -- raise_call_error(args) -- -- --def test_setrelease(monkeypatch): -- commands_called, klass = not_isolated_actions() -- monkeypatch.setattr(mounting, 'NotIsolatedActions', klass) -- monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(dst_ver='8.0')) -- monkeypatch.setattr(config, 'get_product_type', lambda dummy: 'ga') -- enablerhsmreposonrhel8.set_rhsm_release() -- assert commands_called and len(commands_called) == 1 -- assert commands_called[0][0][-1] == '8.0' -- -- --def test_setrelease_submgr_throwing_error(monkeypatch): -- _, klass = not_isolated_actions(raise_err=True) -- monkeypatch.setattr(mounting, 'NotIsolatedActions', klass) -- monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(dst_ver='8.0', envars={'LEAPP_NO_RHSM': '0'})) -- monkeypatch.setattr(config, 'get_product_type', lambda dummy: 'ga') -- # free the set_release funtion from the @_rhsm_retry decorator which would otherwise cause 25 sec delay of the test -- if sys.version_info.major < 3: -- monkeypatch.setattr(rhsm, 'set_release', -- rhsm.set_release.func_closure[0].cell_contents.func_closure[0].cell_contents) -- else: -- monkeypatch.setattr(rhsm, 'set_release', rhsm.set_release.__wrapped__.__wrapped__) -- with pytest.raises(StopActorExecutionError): -- enablerhsmreposonrhel8.set_rhsm_release() -- -- --@pytest.mark.parametrize('product', ['beta', 'htb']) --def test_setrelease_skip_rhsm(monkeypatch, product): -- commands_called, _ = not_isolated_actions() -- monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(envars={'LEAPP_NO_RHSM': '1'})) -- monkeypatch.setattr(api, 'current_logger', logger_mocked()) -- monkeypatch.setattr(config, 'get_product_type', lambda dummy: product) -- # To make this work we need to re-apply the decorator, so it respects the environment variable -- monkeypatch.setattr(rhsm, 'set_release', rhsm.with_rhsm(rhsm.set_release)) -- enablerhsmreposonrhel8.set_rhsm_release() -- assert not commands_called -- -- --def construct_UTRepo_consume(repoids): -- repos = [UsedTargetRepository(repoid=repoid) for repoid in repoids] -- return lambda *x: (x for x in (UsedTargetRepositories(repos=repos),)) -- -- --def test_get_unique_repoids(monkeypatch): -- repoids = (['some-repo', 'some-repo', 'another-repo']) -- monkeypatch.setattr(api, 'consume', construct_UTRepo_consume(repoids)) -- assert enablerhsmreposonrhel8.get_repos_to_enable() == {'some-repo', 'another-repo'} -- -- --def test_get_submgr_cmd(): -- assert enablerhsmreposonrhel8.get_submgr_cmd({'some-repo'}) == ['subscription-manager', 'repos', '--enable', -- 'some-repo'] -- -- --def test_running_submgr_ok(monkeypatch): -- monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(dst_ver='8.0', envars={'LEAPP_NO_RHSM': '0'}), ) -- monkeypatch.setattr(enablerhsmreposonrhel8, 'get_repos_to_enable', lambda: {'some-repo'}) -- monkeypatch.setattr(enablerhsmreposonrhel8, 'run', run_mocked()) -- enablerhsmreposonrhel8.enable_rhsm_repos() -- assert enablerhsmreposonrhel8.run.called -- assert 'subscription-manager' in enablerhsmreposonrhel8.run.args[0][0] -- -- --def test_running_submgr_fail(monkeypatch): -- monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(dst_ver='8.0', envars={'LEAPP_NO_RHSM': '0'}), ) -- monkeypatch.setattr(enablerhsmreposonrhel8, 'get_repos_to_enable', lambda: {'some-repo'}) -- monkeypatch.setattr(enablerhsmreposonrhel8, 'run', run_mocked(raise_err=True)) -- monkeypatch.setattr(api, 'current_logger', logger_mocked()) -- enablerhsmreposonrhel8.enable_rhsm_repos() -- assert enablerhsmreposonrhel8.run.called -- assert api.current_logger.warnmsg -- -- --def test_enable_repos_skip_rhsm(monkeypatch): -- monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(envars={'LEAPP_NO_RHSM': '1'})) -- monkeypatch.setattr(enablerhsmreposonrhel8, 'run', run_mocked()) -- monkeypatch.setattr(api, 'current_logger', logger_mocked()) -- enablerhsmreposonrhel8.enable_rhsm_repos() -- assert not enablerhsmreposonrhel8.run.called -- assert api.current_logger.dbgmsg -diff --git a/repos/system_upgrade/el7toel8/actors/reportsettargetrelease/actor.py b/repos/system_upgrade/el7toel8/actors/reportsettargetrelease/actor.py -deleted file mode 100644 -index c1aa681..0000000 ---- a/repos/system_upgrade/el7toel8/actors/reportsettargetrelease/actor.py -+++ /dev/null -@@ -1,23 +0,0 @@ --from leapp.actors import Actor --from leapp.libraries.actor import reportsettargetrelease --from leapp.models import Report --from leapp.tags import IPUWorkflowTag, TargetTransactionChecksPhaseTag -- -- --class ReportSetTargetRelease(Actor): -- """ -- Reports information related to the release set in the subscription-manager after the upgrade. -- -- When using Red Hat subscription-manager (RHSM), the release is set by default -- to the target version release. In case of skip of the RHSM (--no-rhsm), the -- release stay as it is on the RHEL 7 and user has to handle it manually after -- the upgrade. -- """ -- -- name = 'report_set_target_release' -- consumes = () -- produces = (Report,) -- tags = (IPUWorkflowTag, TargetTransactionChecksPhaseTag) -- -- def process(self): -- reportsettargetrelease.process() -diff --git a/repos/system_upgrade/el7toel8/actors/reportsettargetrelease/libraries/reportsettargetrelease.py b/repos/system_upgrade/el7toel8/actors/reportsettargetrelease/libraries/reportsettargetrelease.py -deleted file mode 100644 -index faed27d..0000000 ---- a/repos/system_upgrade/el7toel8/actors/reportsettargetrelease/libraries/reportsettargetrelease.py -+++ /dev/null -@@ -1,53 +0,0 @@ --from leapp import reporting --from leapp.libraries.stdlib import api --from leapp.libraries.common import rhsm -- -- --def _report_set_release(): -- target_version = api.current_actor().configuration.version.target -- reporting.create_report([ -- reporting.Title( -- 'The subscription-manager release is going to be set after the upgrade'), -- reporting.Summary( -- 'After the upgrade has completed the release of the subscription-manager will be set to {release}.' -- ' This will ensure that you will receive and keep the version you choose to upgrade to.' -- .format(release=target_version) -- ), -- reporting.Severity(reporting.Severity.LOW), -- reporting.Remediation( -- hint='If you wish to receive updates for the latest released version of Anolis 8, run `subscription-manager' -- ' release --unset` after the upgrade.'), -- reporting.Tags([reporting.Tags.UPGRADE_PROCESS]), -- reporting.RelatedResource('package', 'subscription-manager') -- ]) -- -- --def _report_unhandled_release(): -- # TODO: set the POST group after it's created. -- target_version = api.current_actor().configuration.version.target -- hint_command = 'subscription-manager release --set {}'.format(target_version) -- # FIXME: This should use Dialogs and Answers to offer post-upgrade remediation -- # so that users can choose whether to --set or --unset the release number -- hint = 'Set the new release (or unset it) after the upgrade using subscription-manager: ' + hint_command -- reporting.create_report([ -- reporting.Title( -- 'The subscription-manager release is going to be kept as it is during the upgrade'), -- reporting.Summary( -- 'The upgrade is executed with the --no-rhsm option (or with' -- ' the LEAPP_NO_RHSM environment variable). In this case, the subscription-manager' -- ' will not be configured during the upgrade. If the system is subscribed and release' -- ' is set already, you could encounter issues to get Anolis 8 content using DNF/YUM' -- ' after the upgrade.' -- ), -- reporting.Severity(reporting.Severity.LOW), -- reporting.Remediation(hint=hint), -- reporting.Tags([reporting.Tags.UPGRADE_PROCESS]), -- reporting.RelatedResource('package', 'subscription-manager') -- ]) -- -- --def process(): -- if rhsm.skip_rhsm(): -- _report_unhandled_release() -- else: -- _report_set_release() -diff --git a/repos/system_upgrade/el7toel8/actors/reportsettargetrelease/tests/test_targetreleasereport_reportsettargetrelease.py b/repos/system_upgrade/el7toel8/actors/reportsettargetrelease/tests/test_targetreleasereport_reportsettargetrelease.py -deleted file mode 100644 -index d866564..0000000 ---- a/repos/system_upgrade/el7toel8/actors/reportsettargetrelease/tests/test_targetreleasereport_reportsettargetrelease.py -+++ /dev/null -@@ -1,28 +0,0 @@ --import pytest -- --from leapp import reporting --from leapp.libraries.actor import reportsettargetrelease --from leapp.libraries.common import rhsm --from leapp.libraries.common.testutils import create_report_mocked, CurrentActorMocked --from leapp.libraries.stdlib import api -- -- --@pytest.mark.parametrize('version', ['8.{}'.format(i) for i in range(4)]) --def test_report_target_version(monkeypatch, version): -- monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(dst_ver=version)) -- monkeypatch.setattr(rhsm, 'skip_rhsm', lambda: False) -- monkeypatch.setattr(reporting, 'create_report', create_report_mocked()) -- SUMMARY_FMT = 'will be set to {}.' -- reportsettargetrelease.process() -- assert reporting.create_report.called == 1 -- assert SUMMARY_FMT.format(version) in reporting.create_report.report_fields['summary'] -- assert 'is going to be set' in reporting.create_report.report_fields['title'] -- -- --def test_report_unhandled_release(monkeypatch): -- monkeypatch.setattr(api, 'current_actor', CurrentActorMocked(dst_ver='8.1')) -- monkeypatch.setattr(rhsm, 'skip_rhsm', lambda: True) -- monkeypatch.setattr(reporting, 'create_report', create_report_mocked()) -- reportsettargetrelease.process() -- assert reporting.create_report.called == 1 -- assert 'is going to be kept' in reporting.create_report.report_fields['title'] --- -2.29.2 - diff --git a/0006-add-check-extra-modules.patch b/0006-add-check-extra-modules.patch deleted file mode 100644 index c1af7ad..0000000 --- a/0006-add-check-extra-modules.patch +++ /dev/null @@ -1,145 +0,0 @@ -From c99b7859d72054ec070d28ea7e8123ce65d019ba Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Thu, 17 Jun 2021 10:24:56 +0800 -Subject: [PATCH 2/3] add check extra modules - -`lsmod` show the active modules in current system. -we use `modinfo -F signer $module` to get signer of module, -if module is not signed by CentOS or Red Hat, then it must -be provided by third party or users. -since kernel will be updated in upgrade, extra modules may need -modify to compat with new kernel. - -Signed-off-by: Chunmei Xu ---- - .../el7toel8/actors/checkextramodule/actor.py | 39 +++++++++++++++++++ - .../tests/test_check_extramodules.py | 28 +++++++++++++ - .../systemfacts/libraries/systemfacts.py | 22 +++++------ - 3 files changed, 78 insertions(+), 11 deletions(-) - create mode 100644 repos/system_upgrade/el7toel8/actors/checkextramodule/actor.py - create mode 100644 repos/system_upgrade/el7toel8/actors/checkextramodule/tests/test_check_extramodules.py - -diff --git a/repos/system_upgrade/el7toel8/actors/checkextramodule/actor.py b/repos/system_upgrade/el7toel8/actors/checkextramodule/actor.py -new file mode 100644 -index 0000000..6e74915 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkextramodule/actor.py -@@ -0,0 +1,39 @@ -+from leapp.actors import Actor -+from leapp.models import ActiveKernelModulesFacts -+from leapp.tags import ChecksPhaseTag, IPUWorkflowTag -+from leapp import reporting -+from leapp.reporting import Report, create_report -+ -+ -+class CheckExtraModules(Actor): -+ """ -+ Check if any extra modules not signed by redhat or centos. -+ -+ If the kernel module is not signed by redhat or centos, it may be provided -+ by third party or users. -+ """ -+ -+ name = 'check_extramodules' -+ consumes = (ActiveKernelModulesFacts,) -+ produces = (Report,) -+ tags = (ChecksPhaseTag, IPUWorkflowTag) -+ -+ def process(self): -+ extra_modules = [] -+ for fact in self.consume(ActiveKernelModulesFacts): -+ for active_module in fact.kernel_modules: -+ signer = str(active_module.signature) -+ if signer.find('CentOS') == -1 and signer.find('Red Hat') == -1: -+ extra_modules.append(active_module.filename) -+ -+ if list(extra_modules): -+ extra_modules_new_line = '\n'.join(['- ' + p for p in extra_modules]) -+ create_report([ -+ reporting.Title('Found some active modules not signed by redhat or centos'), -+ reporting.Summary( -+ 'The following active modules are not signed by redhat or centos, ' -+ 'please make sure they can be compat with new kernel:\n{}' -+ .format(extra_modules_new_line) -+ ), -+ reporting.Severity(reporting.Severity.HIGH), -+ ]) -diff --git a/repos/system_upgrade/el7toel8/actors/checkextramodule/tests/test_check_extramodules.py b/repos/system_upgrade/el7toel8/actors/checkextramodule/tests/test_check_extramodules.py -new file mode 100644 -index 0000000..8f5227f ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkextramodule/tests/test_check_extramodules.py -@@ -0,0 +1,28 @@ -+from leapp.snactor.fixture import current_actor_context -+from leapp.models import ActiveKernelModule, ActiveKernelModulesFacts -+from leapp.reporting import Report -+ -+ -+def create_modulesfacts(kernel_modules): -+ return ActiveKernelModulesFacts(kernel_modules=kernel_modules) -+ -+ -+def test_actor_with_extra_module(current_actor_context): -+ with_extramodules = [ -+ ActiveKernelModule(filename='btrfs', parameters=[], signature=''), -+ ActiveKernelModule(filename='kvm', parameters=[], signature='')] -+ -+ current_actor_context.feed(create_modulesfacts(kernel_modules=with_extramodules)) -+ current_actor_context.run() -+ report_fields = current_actor_context.consume(Report)[0].report -+ assert report_fields['severity'] == 'high' -+ -+ -+def test_actor_without_extra_module(current_actor_context): -+ without_extramodules = [ -+ ActiveKernelModule(filename='kvm_intel', parameters=[], signature='CentOS'), -+ ActiveKernelModule(filename='kvm', parameters=[], signature='Red Hat')] -+ -+ current_actor_context.feed(create_modulesfacts(kernel_modules=without_extramodules)) -+ current_actor_context.run() -+ assert not current_actor_context.consume(Report) -diff --git a/repos/system_upgrade/el7toel8/actors/systemfacts/libraries/systemfacts.py b/repos/system_upgrade/el7toel8/actors/systemfacts/libraries/systemfacts.py -index 072c4bf..c2be8cb 100644 ---- a/repos/system_upgrade/el7toel8/actors/systemfacts/libraries/systemfacts.py -+++ b/repos/system_upgrade/el7toel8/actors/systemfacts/libraries/systemfacts.py -@@ -76,19 +76,9 @@ def _get_active_kernel_modules(logger): - for l in lines[1:]: - name = l.split(' ')[0] - -- # Read parameters of the given module as exposed by the -- # `/sys` VFS, if there are no parameters exposed we just -- # take the name of the module -- base_path = '/sys/module/{module}'.format(module=name) -- parameters_path = os.path.join(base_path, 'parameters') -- if not os.path.exists(parameters_path): -- yield ActiveKernelModule(filename=name, parameters=[]) -- continue -- - # Use `modinfo` to probe for signature information -- parameter_dict = {} - try: -- signature = run(['modinfo', '-F', 'signature', name], split=False)['stdout'] -+ signature = run(['modinfo', '-F', 'signer', name], split=False)['stdout'] - except CalledProcessError: - signature = None - -@@ -97,6 +87,16 @@ def _get_active_kernel_modules(logger): - # Remove whitspace from the signature string - signature_string = re.sub(r"\s+", "", signature, flags=re.UNICODE) - -+ # Read parameters of the given module as exposed by the -+ # `/sys` VFS, if there are no parameters exposed we just -+ # take the name of the module -+ base_path = '/sys/module/{module}'.format(module=name) -+ parameters_path = os.path.join(base_path, 'parameters') -+ if not os.path.exists(parameters_path): -+ yield ActiveKernelModule(filename=name, parameters=[], signature=signature_string) -+ continue -+ -+ parameter_dict = {} - # Since we're using the `/sys` VFS we need to use `os.listdir()` to get - # all the property names and then just read from all the listed paths - parameters = sorted(os.listdir(parameters_path)) --- -2.29.2 - diff --git a/0007-add-checkopenssl.patch b/0007-add-checkopenssl.patch deleted file mode 100644 index c2e30b5..0000000 --- a/0007-add-checkopenssl.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 563c386dbad9a7846ddc82d9fe224fcbb978e5b4 Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Thu, 17 Jun 2021 11:29:41 +0800 -Subject: [PATCH 3/3] add checkopenssl - -openssl-1.1.1 has removed some ciphers which are default enabled -by openssl-1.0.2, if openssl/openssl-libs is installed, give this -important changes. -to #34990771 - -Signed-off-by: Chunmei Xu ---- - .../el7toel8/actors/checkopenssl/actor.py | 76 +++++++++++++++++++ - .../tests/component_test_checkopenssl.py | 33 ++++++++ - 2 files changed, 109 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/checkopenssl/actor.py - create mode 100644 repos/system_upgrade/el7toel8/actors/checkopenssl/tests/component_test_checkopenssl.py - -diff --git a/repos/system_upgrade/el7toel8/actors/checkopenssl/actor.py b/repos/system_upgrade/el7toel8/actors/checkopenssl/actor.py -new file mode 100644 -index 0000000..995cb2f ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkopenssl/actor.py -@@ -0,0 +1,76 @@ -+from leapp.actors import Actor -+from leapp.libraries.common.rpms import has_package -+from leapp.models import InstalledRedHatSignedRPM -+from leapp.reporting import Report, create_report -+from leapp import reporting -+from leapp.tags import ChecksPhaseTag, IPUWorkflowTag -+ -+ -+class CheckOpenssl(Actor): -+ """ -+ Check if openssl is installed. If yes, write information about important changes. -+ """ -+ -+ name = 'checkopenssl' -+ consumes = (InstalledRedHatSignedRPM,) -+ produces = (Report,) -+ tags = (ChecksPhaseTag, IPUWorkflowTag) -+ -+ def process(self): -+ removed_ciphers = '''DH-DSS-AES256-GCM-SHA384 -+DH-RSA-AES256-GCM-SHA384 -+DH-RSA-AES256-SHA256 -+DH-DSS-AES256-SHA256 -+DH-RSA-AES256-SHA -+DH-DSS-AES256-SHA -+DH-RSA-CAMELLIA256-SHA -+DH-DSS-CAMELLIA256-SHA -+ECDH-RSA-AES256-GCM-SHA384 -+ECDH-ECDSA-AES256-GCM-SHA384 -+ECDH-RSA-AES256-SHA384 -+ECDH-ECDSA-AES256-SHA384 -+ECDH-RSA-AES256-SHA -+ECDH-ECDSA-AES256-SHA -+DH-DSS-AES128-GCM-SHA256 -+DH-RSA-AES128-GCM-SHA256 -+DH-RSA-AES128-SHA256 -+DH-DSS-AES128-SHA256 -+DH-RSA-AES128-SHA -+DH-DSS-AES128-SHA -+DH-RSA-SEED-SHA -+DH-DSS-SEED-SHA -+DH-RSA-CAMELLIA128-SHA -+DH-DSS-CAMELLIA128-SHA -+ECDH-RSA-AES128-GCM-SHA256 -+ECDH-ECDSA-AES128-GCM-SHA256 -+ECDH-RSA-AES128-SHA256 -+ECDH-ECDSA-AES128-SHA256 -+ECDH-RSA-AES128-SHA -+ECDH-ECDSA-AES128-SHA -+EDH-RSA-DES-CBC3-SHA -+EDH-DSS-DES-CBC3-SHA -+DH-RSA-DES-CBC3-SHA -+DH-DSS-DES-CBC3-SHA -+ECDH-RSA-DES-CBC3-SHA -+ECDH-ECDSA-DES-CBC3-SHA -+KRB5-IDEA-CBC-SHA -+KRB5-DES-CBC3-SHA -+KRB5-IDEA-CBC-MD5 -+KRB5-DES-CBC3-MD5 -+ECDH-RSA-RC4-SHA -+ECDH-ECDSA-RC4-SHA -+RC4-MD5 -+KRB5-RC4-SHA -+KRB5-RC4-MD5''' -+ if has_package(InstalledRedHatSignedRPM, 'openssl') or has_package(InstalledRedHatSignedRPM, 'openssl-libs'): -+ create_report([ -+ reporting.Title('openssl ciphers have import changes between 1.0.2 and 1.1.1'), -+ reporting.Summary( -+ 'Anolis8 will introduce openssl 1.1.1, openssl-1.1.1 remove some ciphers ' -+ 'which are default enabled on openssl-1.0.2, these ciphers are:\n{}' -+ .format(removed_ciphers) -+ ), -+ reporting.Severity(reporting.Severity.HIGH), -+ reporting.Remediation(hint='Please make sure your application do not use these ciphers and modify to use other ciphers.'), -+ reporting.RelatedResource('package', 'openssl') -+ ]) -diff --git a/repos/system_upgrade/el7toel8/actors/checkopenssl/tests/component_test_checkopenssl.py b/repos/system_upgrade/el7toel8/actors/checkopenssl/tests/component_test_checkopenssl.py -new file mode 100644 -index 0000000..de71020 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checkopenssl/tests/component_test_checkopenssl.py -@@ -0,0 +1,33 @@ -+from leapp.snactor.fixture import current_actor_context -+from leapp.models import InstalledRedHatSignedRPM, RPM -+from leapp.reporting import Report -+ -+RH_PACKAGER = 'Red Hat, Inc. ' -+ -+ -+def create_modulesfacts(installed_rpm): -+ return InstalledRedHatSignedRPM(items=installed_rpm) -+ -+ -+def test_actor_with_openssl_package(current_actor_context): -+ with_openssl = [ -+ RPM(name='openssl', version='1.0.2', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=with_openssl)) -+ current_actor_context.run() -+ assert current_actor_context.consume(Report) -+ -+ -+def test_actor_without_openssl_package(current_actor_context): -+ without_openssl = [ -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='sed', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=without_openssl)) -+ current_actor_context.run() -+ assert not current_actor_context.consume(Report) --- -2.29.2 - diff --git a/0008-compat-platform_id-to-al8-when-upgrade-to-alinux3.patch b/0008-compat-platform_id-to-al8-when-upgrade-to-alinux3.patch deleted file mode 100644 index 5750606..0000000 --- a/0008-compat-platform_id-to-al8-when-upgrade-to-alinux3.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 158fa91d22a7987235f20ecc6bd84160a4b20b18 Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Fri, 18 Jun 2021 14:19:53 +0800 -Subject: [PATCH] compat platform_id to al8 when upgrade to alinux3 - -Signed-off-by: Chunmei Xu ---- - .../actors/targetuserspacecreator/libraries/userspacegen.py | 5 ++++- - repos/system_upgrade/el7toel8/libraries/dnfplugin.py | 5 ++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/libraries/userspacegen.py b/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/libraries/userspacegen.py -index f2d867c..7f96e0e 100644 ---- a/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/libraries/userspacegen.py -+++ b/repos/system_upgrade/el7toel8/actors/targetuserspacecreator/libraries/userspacegen.py -@@ -107,7 +107,10 @@ def get_platform_id(target_repoids): - for repo in target_repoids: - if repo.find('Anolis') != -1 or repo.find('anolis') != -1: - platform_id = 'platform:an8' -- return platform_id -+ break -+ elif repo.find('Alinux3') != -1 or repo.find('alinux3') != -1: -+ platform_id = 'platform:al8' -+ break - return platform_id - - def prepare_target_userspace(context, userspace_dir, enabled_repos, packages): -diff --git a/repos/system_upgrade/el7toel8/libraries/dnfplugin.py b/repos/system_upgrade/el7toel8/libraries/dnfplugin.py -index d271212..467d9ea 100644 ---- a/repos/system_upgrade/el7toel8/libraries/dnfplugin.py -+++ b/repos/system_upgrade/el7toel8/libraries/dnfplugin.py -@@ -35,7 +35,10 @@ def get_platform_id(target_repoids): - for repo in target_repoids: - if repo.find('Anolis') != -1 or repo.find('anolis') != -1: - platform_id = 'platform:an8' -- return platform_id -+ break -+ if repo.find('Alinux3') != -1 or repo.find('alinux3') != -1: -+ platform_id = 'platform:al8' -+ break - return platform_id - - def build_plugin_data(target_repoids, debug, test, tasks, on_aws): --- -2.29.2 - diff --git a/0009-add-checksysstat.patch b/0009-add-checksysstat.patch deleted file mode 100644 index 06af280..0000000 --- a/0009-add-checksysstat.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 7e1cc1b56210bc57bb185e50bb0fafb0046fb5f5 Mon Sep 17 00:00:00 2001 -From: Chunmei Xu -Date: Sat, 26 Jun 2021 12:46:46 +0800 -Subject: [PATCH 1/3] add checksysstat - -/etc/cron.d/sysstat is removed from sysstat, -and sysstat cron task is replaced by sysstat-collect.timer and -sysstat-summary.timer - -Signed-off-by: Chunmei Xu ---- - .../el7toel8/actors/checksysstat/actor.py | 31 +++++++++++++++++ - .../tests/component_test_checksysstat.py | 33 +++++++++++++++++++ - 2 files changed, 64 insertions(+) - create mode 100644 repos/system_upgrade/el7toel8/actors/checksysstat/actor.py - create mode 100644 repos/system_upgrade/el7toel8/actors/checksysstat/tests/component_test_checksysstat.py - -diff --git a/repos/system_upgrade/el7toel8/actors/checksysstat/actor.py b/repos/system_upgrade/el7toel8/actors/checksysstat/actor.py -new file mode 100644 -index 0000000..0e07ef2 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checksysstat/actor.py -@@ -0,0 +1,31 @@ -+from leapp.actors import Actor -+from leapp.libraries.common.rpms import has_package -+from leapp.models import InstalledRedHatSignedRPM -+from leapp.reporting import Report, create_report -+from leapp import reporting -+from leapp.tags import ChecksPhaseTag, IPUWorkflowTag -+ -+ -+class CheckSysstat(Actor): -+ """ -+ Check if sysstat is installed. If yes, write information about sysstat changes. -+ """ -+ -+ name = 'checksysstat' -+ consumes = (InstalledRedHatSignedRPM,) -+ produces = (Report,) -+ tags = (ChecksPhaseTag, IPUWorkflowTag) -+ -+ def process(self): -+ if has_package(InstalledRedHatSignedRPM, 'sysstat'): -+ create_report([ -+ reporting.Title('sysstat cron task is replaced by sysstat-collect and sysstat-summary'), -+ reporting.Summary( -+ 'In Anolis8, sysstat-collect will collect system activity accounting, ' -+ 'sysstat-summary will generate a daily summary of process accounting.' -+ '/etc/cron.d/sysstat is removed from sysstat for cron task is replaced by ' -+ 'sysstat-collect.timer and sysstat-summary.timer.' -+ ), -+ reporting.Severity(reporting.Severity.LOW), -+ reporting.RelatedResource('package', 'sysstat') -+ ]) -diff --git a/repos/system_upgrade/el7toel8/actors/checksysstat/tests/component_test_checksysstat.py b/repos/system_upgrade/el7toel8/actors/checksysstat/tests/component_test_checksysstat.py -new file mode 100644 -index 0000000..c62e742 ---- /dev/null -+++ b/repos/system_upgrade/el7toel8/actors/checksysstat/tests/component_test_checksysstat.py -@@ -0,0 +1,33 @@ -+from leapp.snactor.fixture import current_actor_context -+from leapp.models import InstalledRedHatSignedRPM, RPM -+from leapp.reporting import Report -+ -+RH_PACKAGER = 'Red Hat, Inc. ' -+ -+ -+def create_modulesfacts(installed_rpm): -+ return InstalledRedHatSignedRPM(items=installed_rpm) -+ -+ -+def test_actor_with_sysstat_package(current_actor_context): -+ with_sysstat = [ -+ RPM(name='sysstat', version='10.1.5', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=with_sysstat)) -+ current_actor_context.run() -+ assert current_actor_context.consume(Report) -+ -+ -+def test_actor_without_sysstat_package(current_actor_context): -+ without_sysstat = [ -+ RPM(name='powertop', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51'), -+ RPM(name='sed', version='0.1', release='1.sm01', epoch='1', packager=RH_PACKAGER, arch='noarch', -+ pgpsig='RSA/SHA256, Mon 01 Jan 1970 00:00:00 AM -03, Key ID 199e2f91fd431d51')] -+ -+ current_actor_context.feed(create_modulesfacts(installed_rpm=without_sysstat)) -+ current_actor_context.run() -+ assert not current_actor_context.consume(Report) --- -2.29.2 - -- Gitee From a0dec4854eca68ce65a0f7cffdd4edc0171f3e7f Mon Sep 17 00:00:00 2001 From: wangzhe Date: Thu, 25 May 2023 20:01:09 +0800 Subject: [PATCH 5/5] switch from rpm tree to source tree, remove patch step Signed-off-by: wangzhe --- leapp-repository.spec | 50 ++++--------------------------------------- 1 file changed, 4 insertions(+), 46 deletions(-) diff --git a/leapp-repository.spec b/leapp-repository.spec index 2786e44..cb9357d 100644 --- a/leapp-repository.spec +++ b/leapp-repository.spec @@ -11,7 +11,7 @@ }\ py2_byte_compile "%1" "%2"} -%define anolis_release 24 +%define anolis_release 25 Name: leapp-repository Version: 0.13.0 @@ -26,51 +26,6 @@ Source2: leapp_upgrade_repositories.repo Source3: pes-events.json Source4: repomap.csv -Patch1: 0001-add-centos7-key-to-support-upgrade-of-centos7-to-cen.patch -Patch2: 0002-support-centos.patch -Patch3: 0003-on-anolis-platform_id-should-be-an8-instead-of-el8.patch -Patch4: 0004-update-RHEL8-to-anolis8.patch -Patch5: 0005-remove-rhsm-related-settings-after-upgrade.patch -Patch6: 0006-add-check-extra-modules.patch -Patch7: 0007-add-checkopenssl.patch -Patch8: 0008-compat-platform_id-to-al8-when-upgrade-to-alinux3.patch -Patch9: 0009-add-checksysstat.patch -Patch10: 0010-add-checkaudit.patch -Patch11: 0011-add-checkmandb.patch -Patch12: 0012-add-checkpkgforupgrade.patch -Patch13: 0013-add-checksystemd.patch -Patch14: 0014-add-checkglibc.patch -Patch15: 0015-update-grub.cfg-for-uefi-and-keep-some-packages.patch -Patch16: 0016-add-key-of-aarch64-kernel-for-centos7.x.patch -Patch17: 0017-change-redhat-to-anolis.patch -Patch18: 0018-add-checksysvinittools.patch -Patch19: 0019-add-checkdocker.patch -Patch20: 0020-add-tomcat-detection.patch -Patch21: 0021-support-anolis7.patch -Patch22: 0022-add-checklvm2cluster.patch -Patch23: 0023-fix-kernel-version-check-of-anolis-kernel.patch -Patch24: 0024-remove-unofficial-url.patch -#Patch25: 0025-add-check-openssl11-libs.patch -Patch26: 0026-Add-checkbaota-actor.patch -Patch27: 0027-upgrade-write-efi-vars-for-ecs-firmware.patch -Patch28: 0028-add-disablerepo-option-to-upgrade-kernel-to-RHCK.patch -Patch29: 0029-Service-configuration-remains-after-migration.patch -Patch30: 0030-fix-subprocess-check_output-method-for-backup-service-configuration.patch -#Patch31: 0031-Deal-with-EPEL-repositories-create-by-user-mannally.patch -Patch32: 0032-Keep-PermitRootLogin-authentication-behavior-after-m.patch -Patch33: 0033-Read-the-driver-list-supported-by-ANCK.patch -Patch34: 0034-migrear-grub2-entry-recovery.patch -Patch35: 0035-GRUB2-EFI-support.patch -Patch36: 0036-Perform-system-requirements-check-to-ensure-migratio.patch -Patch37: 0037-Add-RPMDownloadOrInstallError-and-its-exit-code.patch -Patch38: 0038-Provides-more-information-for-debug-purpose-when-exc.patch -Patch39: 0039-Add-grub2-tools-update-into-answerfile.patch -Patch40: 0040-Fix-colloecting-virtio-nic-info-error.patch -Patch41: 0041-Add-python-devel-version-check-and-update.patch -Patch42: 0042-Report-inhibitor-message-to-SMC.patch -Patch43: 0043-Fix-the-memory-unit-error.patch -Patch44: 0044-Setup-3rd-repo-available-if-some-pkg-installed-from-.patch -Patch45: 0045-Fix-bug-with-existing-symlink-in-handleyumconfig.patch BuildArch: noarch BuildRequires: python-devel @@ -198,6 +153,9 @@ done; # no files here %changelog +* Thu May 25 2023 wangzhe - 0.13.0-2.25 +- switch from rpm tree to source tree, remove all patch + * Thu May 18 2023 Cichen Wang - 0.13.0-2.24 - Fix bug with existing symlink in handleyumconfig -- Gitee