--- loncom/build/distprobe 2021/12/20 03:13:29 1.25 +++ loncom/build/distprobe 2021/12/21 13:57:47 1.26 @@ -2,7 +2,7 @@ # # The LearningOnline Network with CAPA # -# $Id: distprobe,v 1.25 2021/12/20 03:13:29 raeburn Exp $ +# $Id: distprobe,v 1.26 2021/12/21 13:57:47 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -64,8 +64,11 @@ if (-e '/etc/oracle-release') { $dist = 'rhes'.$1; } elsif ($versionstring =~ /Red Hat Enterprise Linux release (\d+)/) { $dist = 'rhes'.$1; - } elsif ($versionstring =~ /CentOS(?:| Linux| Stream) release (\d+)/) { - $dist = 'centos'.$1; + } elsif ($versionstring =~ /CentOS(| Linux| Stream) release (\d+)/) { + $dist = 'centos'.$2; + if ($1 eq ' Stream') { + $dist .= '-stream'; + } } elsif ($versionstring =~ /Scientific Linux (?:SL )?release ([\d.]+) /) { my $ver = $1; $ver =~ s/\.\d+$//;