Merge pull request #325 from sfbee/BC-6603_and_6604

Enable powertools and epel repos, and disable cpanel-plugins repo.
cpanel · Nov 29, 2023 · f423dcb · f423dcb
2 parents 0abeaa3 + a958d1f
commit f423dcb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/elevate-cpanel b/elevate-cpanel
@@ -5724,12 +5724,15 @@ sub run_stage_4 ($self) {
             # no failures once already installed: no need to check for the epel-release version
             $self->ssystem_and_die(qw{/usr/bin/dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm});
 
+            $self->ssystem(qw{/usr/bin/dnf config-manager --enable powertools});
+            $self->ssystem(qw{/usr/bin/dnf config-manager --enable epel});
+
             $self->ssystem(qw{/usr/bin/rm -f /usr/local/cpanel/3rdparty/bin/perl});
             {
                 local $ENV{'CPANEL_BASE_INSTALL'} = 1;    # Don't fix more than perl itself.
                 $self->ssystem(qw{/usr/local/cpanel/scripts/fix-cpanel-perl});
             }
-            $self->ssystem(qw{/usr/bin/dnf -y --allowerasing update});
+            $self->ssystem(qw{/usr/bin/dnf -y --allowerasing --disablerepo cpanel-plugins update});
             $self->ssystem_and_die(qw{/usr/local/cpanel/scripts/sysup});
 
             return;

diff --git a/script/elevate-cpanel.PL b/script/elevate-cpanel.PL
@@ -1082,12 +1082,15 @@ sub run_stage_4 ($self) {
             # no failures once already installed: no need to check for the epel-release version
             $self->ssystem_and_die(qw{/usr/bin/dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm});
 
+            $self->ssystem(qw{/usr/bin/dnf config-manager --enable powertools});
+            $self->ssystem(qw{/usr/bin/dnf config-manager --enable epel});
+
             $self->ssystem(qw{/usr/bin/rm -f /usr/local/cpanel/3rdparty/bin/perl});
             {
                 local $ENV{'CPANEL_BASE_INSTALL'} = 1;    # Don't fix more than perl itself.
                 $self->ssystem(qw{/usr/local/cpanel/scripts/fix-cpanel-perl});
             }
-            $self->ssystem(qw{/usr/bin/dnf -y --allowerasing update});
+            $self->ssystem(qw{/usr/bin/dnf -y --allowerasing --disablerepo cpanel-plugins update});
             $self->ssystem_and_die(qw{/usr/local/cpanel/scripts/sysup});
 
             return;