加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
0004-update-RHEL8-to-anolis8.patch 95.97 KB
一键复制 编辑 原始数据 按行查看 历史
Meredith 提交于 2021-08-27 10:48 . add leapp-repository related files
12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607
From dcd8439de78f2775e4b55605f5daca00b9509605 Mon Sep 17 00:00:00 2001
From: Chunmei Xu <xuchunmei@openanolis.org>
Date: Wed, 9 Jun 2021 16:39:27 +0800
Subject: [PATCH] update RHEL8 to anolis8
Signed-off-by: Chunmei Xu <xuchunmei@openanolis.org>
---
.../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
Loading...
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化