diff -Nur smeserver-yum-2.4.0.old/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL smeserver-yum-2.4.0/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL --- smeserver-yum-2.4.0.old/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-yum-2.4.0/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL 2019-12-05 10:15:48.300000000 -0500 @@ -0,0 +1,20 @@ +{ + use POSIX qw(strftime); + use File::Slurp; + #get CentOS release we are + my $SUBVER = read_file('/etc/centos-release'); + $SUBVER =~ s/^CentOS Linux release ([0-9\.]+).*?$/$1/; + return unless $1; + my $curdate = strftime '%Y%m%d', localtime; + # return unless EOL is reached + return unless ( "$curdate" >= "20201130"); + for my $name ( qw(base updates centosplus extras fasttrack contrib) ) + { + my $repo = $DB->get($name) or next; + my $rname = ( $name eq 'base' )? 'os' :$name; + # setprop BaseURL "http://vault.centos.org/$SUBVER/$rname/\$basearch/" + $repo->set_prop('BaseURL', "http://vault.centos.org/$SUBVER/$rname/\$basearch/"); + # delprop MirrorList + $repo->delete_prop('MirrorList'); + } +} diff -Nur smeserver-yum-2.4.0.old/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL smeserver-yum-2.4.0/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL --- smeserver-yum-2.4.0.old/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL 2020-12-03 16:40:55.145000000 -0500 +++ smeserver-yum-2.4.0/root/etc/e-smith/db/yum_repositories/migrate/45CentOSEOL 2020-12-03 16:53:48.377000000 -0500 @@ -3,18 +3,25 @@ use File::Slurp; #get CentOS release we are my $SUBVER = read_file('/etc/centos-release'); - $SUBVER =~ s/^CentOS Linux release ([0-9\.]+).*?$/$1/; - return unless $1; + $SUBVER =~ s/^CentOS (Linux )?release ([0-9\.]+).*?$/$2/; + chomp $SUBVER; + $SUBVER = $yum{eolversion} || $SUBVER || "6.10" ; + return unless $SUBVER ne ""; my $curdate = strftime '%Y%m%d', localtime; # return unless EOL is reached return unless ( "$curdate" >= "20201130"); - for my $name ( qw(base updates centosplus extras fasttrack contrib) ) + for my $name ( qw(base updates centosplus extras fasttrack contrib centos-sclo-rh centos-sclo-centos) ) { my $repo = $DB->get($name) or next; my $rname = ( $name eq 'base' )? 'os' :$name; + $rname = 'sclo' if $name eq "centos-sclo-rh" or $name eq "centos-sclo-centos"; + 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->delete_prop('MirrorList'); + $repo->set_prop('MirrorList', "disabled"); } } diff -Nur smeserver-yum-2.4.0.old/root/etc/e-smith/templates/etc/yum.smerepos.d/sme-base.repo/20repositories smeserver-yum-2.4.0/root/etc/e-smith/templates/etc/yum.smerepos.d/sme-base.repo/20repositories --- smeserver-yum-2.4.0.old/root/etc/e-smith/templates/etc/yum.smerepos.d/sme-base.repo/20repositories 2013-01-31 11:35:08.000000000 -0500 +++ smeserver-yum-2.4.0/root/etc/e-smith/templates/etc/yum.smerepos.d/sme-base.repo/20repositories 2020-12-03 16:53:38.184000000 -0500 @@ -13,14 +13,14 @@ $OUT .= "enabled=" . (($repos->prop('status') eq 'enabled') ? 1 : 0) . "\n"; - if ( exists $props{MirrorList} ) + if ( ! exists $props{MirrorList} or $props{MirrorList} eq "disabled" ) + { + $OUT .= 'baseurl=' . $props{BaseURL} . "\n"; + } + else { $OUT .= 'mirrorlist=' . $props{MirrorList} . "\n"; } - else - { - $OUT .= 'baseurl=' . $props{BaseURL} . "\n"; - } for my $prop (qw(Name)) {