diff -Nur smeserver-yum-2.6.0.old/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL smeserver-yum-2.6.0/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL --- smeserver-yum-2.6.0.old/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL 2020-12-03 17:17:44.568000000 -0500 +++ smeserver-yum-2.6.0/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL 2020-12-03 17:21:53.177000000 -0500 @@ -4,17 +4,22 @@ #get CentOS release we are my $SUBVER = read_file('/etc/centos-release'); $SUBVER =~ s/^CentOS Linux release ([0-9\.]+).*?$/$1/; - return unless $1; + chomp $SUBVER; + $SUBVER = $yum{eolversion} || $SUBVER ; + return unless $SUBVER ne ""; my $curdate = strftime '%Y%m%d', localtime; # return unless EOL is reached return unless ( "$curdate" >= "20240630"); - for my $name ( qw(base updates centosplus extras fasttrack) ) + for my $name ( qw(base updates centosplus extras fasttrack centos-sclo-rh centos-sclo-centos) ) { my $repo = $DB->get($name) or next; my $rname = ( $name eq 'base' )? 'os' :$name; + my $sclo = ""; + $sclo = "rh/" if $name eq "centos-sclo-rh"; + $sclo = "sclo/" if $name eq "centos-sclo-centos"; # setprop BaseURL "http://vault.centos.org/$SUBVER/$rname/\$basearch/" - $repo->set_prop('BaseURL', "http://vault.centos.org/$SUBVER/$rname/\$basearch/"); + $repo->set_prop('BaseURL', "http://vault.centos.org/$SUBVER/$rname/\$basearch/$sclo"); # delprop MirrorList - $repo->delete_prop('MirrorList'); + $repo->set_prop('MirrorList', "disabled"); } } diff -Nur smeserver-yum-2.6.0.old/root/etc/e-smith/templates/etc/yum.smerepos.d/sme-base.repo/20repositories smeserver-yum-2.6.0/root/etc/e-smith/templates/etc/yum.smerepos.d/sme-base.repo/20repositories --- smeserver-yum-2.6.0.old/root/etc/e-smith/templates/etc/yum.smerepos.d/sme-base.repo/20repositories 2020-12-03 17:17:44.543000000 -0500 +++ smeserver-yum-2.6.0/root/etc/e-smith/templates/etc/yum.smerepos.d/sme-base.repo/20repositories 2020-12-03 17:22:37.869000000 -0500 @@ -15,13 +15,13 @@ $OUT .= "enabled=" . (($repos->prop('status') eq 'enabled') ? 1 : 0) . "\n"; - if ( exists $props{MirrorList} ) + if ( ! exists $props{MirrorList} or $props{MirrorList} eq "disabled" ) { - $OUT .= 'mirrorlist=' . $props{MirrorList} . "\n"; + $OUT .= 'baseurl=' . $props{BaseURL} . "\n"; } else { - $OUT .= 'baseurl=' . $props{BaseURL} . "\n"; + $OUT .= 'mirrorlist=' . $props{MirrorList} . "\n"; } for my $prop (qw(Name))