From ad5f8b2e278b867d06e2d65d6faffd9d395dfdf3 Mon Sep 17 00:00:00 2001 From: lumarel Date: Mon, 21 Jun 2021 20:58:48 +0200 Subject: [PATCH] More checking to make sure to not get any other configurations --- migrate2rocky/README.md | 3 +++ migrate2rocky/migrate2rocky.sh | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/migrate2rocky/README.md b/migrate2rocky/README.md index ec2c168..dc0881a 100644 --- a/migrate2rocky/README.md +++ b/migrate2rocky/README.md @@ -30,6 +30,9 @@ base packages, the migration result will end in a corrupted system. This especially happens on systems configured with a centralized package management like Katello (RedHat Satellite 6) or Uyuni (RedHat Satellite 5, SUSE Manager). +If one of these systems is configured it is possible to remove all projects/channels +so the designated /etc/yum.repos.d/redhat.repo or +/etc/yum.repos.d/susemanager:channels.repo file is empty or missing. #### RHEL migrations show error messages during conversion diff --git a/migrate2rocky/migrate2rocky.sh b/migrate2rocky/migrate2rocky.sh index de2dbce..a84a0f3 100644 --- a/migrate2rocky/migrate2rocky.sh +++ b/migrate2rocky/migrate2rocky.sh @@ -188,11 +188,11 @@ exit_clean () { } pre_check () { - if [[ -e /etc/yum.repos.d/redhat.repo ]]; then - exit_message "Migration from Katello-modified systems is not supported by migrate2rocky.\nPlease unconfigure all Katello configured repos, remove the /etc/yum.repos.d/redhat.repo file and re-enable the original repos." + if [[ -e /etc/rhsm/ca/katello-server-ca.pem ]] || [[ -s /etc/yum.repos.d/redhat.repo ]]; then + exit_message "Migration from Katello-modified systems is not supported by migrate2rocky. See the README file for details." fi - if [[ -e /etc/yum.repos.d/susemanager\:channels.repo ]]; then - exit_message "Migration from Uyuni-modified systems is not supported by migrate2rocky.\nPlease unconfigure all Uyuni configured repos, remove the /etc/yum.repos.d/susemanager:channels.repo file and re-enable the original repos." + if [[ -e /etc/salt/minion.d/susemanager.conf ]] || [[ -s /etc/yum.repos.d/susemanager\:channels.repo ]]; then + exit_message "Migration from Uyuni/SUSE Manager-modified systems is not supported by migrate2rocky. See the README file for details." fi }