arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-Avoid calling subprocesses in favor of perl builtins

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6991 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2010-08-06 12:36:39 +00:00
parent ea8483cbe0
commit 4da5599717
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
perl-xCAT/xCAT/Utils.pm
View File

@ -4561,11 +4561,16 @@ sub osver
my $ver = '';
my $line = '';
my @lines;
my $relfile;
if (-f "/etc/redhat-release")
{
chomp($line = `head -n 1 /etc/redhat-release`);
open($relfile,"<","/etc/redhat-release");
$line = <$relfile>;
close($relfile);
chomp($line);
$os = "rh";
chomp($ver = `tr -d '.' < /etc/redhat-release | head -n 1`);
$ver=$line;
$ver=~ tr/\.//;
$ver =~ s/[^0-9]*([0-9]+).*/$1/;
if ($line =~ /AS/) { $os = 'rhas' }
elsif ($line =~ /ES/) { $os = 'rhes' }
@ -4576,10 +4581,14 @@ sub osver
}
elsif (-f "/etc/SuSE-release")
{
chomp(@lines = `cat /etc/SuSE-release`);
open($relfile,"<","/etc/SuSE-release");
@lines = <$relfile>;
close($relfile);
chomp(@lines);
if (grep /SLES|Enterprise Server/, @lines) { $os = "sles" }
if (grep /SLEC/, @lines) { $os = "slec" }
chomp($ver = `tr -d '.' < /etc/SuSE-release | head -n 1 `);
$ver = $lines[0];
$ver =~ tr/\.//;
$ver =~ s/[^0-9]*([0-9]+).*/$1/;
#print "ver: $ver\n";
@ -4588,7 +4597,10 @@ sub osver
{
$os = "ul";
chomp($ver = `tr -d '.' < /etc/UnitedLinux-release | head -n 1 `);
open($relfile,"<","/etc/UnitedLinux-release");
$ver = <$relfile>;
close($relfile);
$ver =~ tr/\.//;
$ver =~ s/[^0-9]*([0-9]+).*/$1/;
}
$os = "$os" . "$ver";