From 47bcc75d713f7352076ad31f865206b6421b0773 Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 27 Mar 2013 10:19:30 +0000
Subject: [PATCH] enhanced function Utils->osver() to accept paramerters to
output different data. If no parameter, the output will be same as before.
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@15670 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
perl-xCAT/xCAT/Utils.pm | 56 +++++++++++++++++++++++++++++++++++------
1 file changed, 49 insertions(+), 7 deletions(-)
diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm
index 4536985b2..d5abd26ed 100644
--- a/perl-xCAT/xCAT/Utils.pm
+++ b/perl-xCAT/xCAT/Utils.pm
@@ -2066,7 +2066,8 @@ sub CheckVersion
=head3 osver
Returns the os and version of the System you are running on
Arguments:
- none
+ $type: which type of os infor you want. Supported values are:
+ all,os,version,release
Returns:
0 - ok
Globals:
@@ -2083,9 +2084,16 @@ sub CheckVersion
#-------------------------------------------------------------------------------
sub osver
{
+ my $type = shift;
+ if ($type =~ /xCAT::Utils/)
+ {
+ $type = shift;
+ }
+
my $osver = "unknown";
my $os = '';
my $ver = '';
+ my $rel = '';
my $line = '';
my @lines;
my $relfile;
@@ -2096,14 +2104,31 @@ sub osver
close($relfile);
chomp($line);
$os = "rh";
+ my $verrel=$line;
$ver=$line;
- $ver=~ tr/\.//;
- $ver =~ s/[^0-9]*([0-9]+).*/$1/;
+ if ( $type ) {
+ $verrel =~ s/[^0-9]*([0-9.]+).*/$1/;
+ ($ver,$rel) = split /\./, $verrel;
+ } else {
+ $ver=~ tr/\.//;
+ $ver =~ s/[^0-9]*([0-9]+).*/$1/;
+ }
if ($line =~ /AS/) { $os = 'rhas' }
elsif ($line =~ /ES/) { $os = 'rhes' }
elsif ($line =~ /WS/) { $os = 'rhws' }
- elsif ($line =~ /Server/) { $os = 'rhserver' }
- elsif ($line =~ /Client/) { $os = 'rhclient' }
+ elsif ($line =~ /Server/) {
+ if ( $type ) {
+ $os = 'rhels';
+ } else {
+ $os = 'rhserver';
+ }
+ } elsif ($line =~ /Client/) {
+ if ( $type ) {
+ $os = 'rhel';
+ } else {
+ $os = 'rhclient';
+ }
+ }
elsif (-f "/etc/fedora-release") { $os = 'rhfc' }
}
elsif (-f "/etc/SuSE-release")
@@ -2118,6 +2143,10 @@ sub osver
$ver =~ tr/\.//;
$ver =~ s/[^0-9]*([0-9]+).*/$1/;
+ $rel = $lines[2];
+ $ver =~ tr/\.//;
+ $rel =~ s/[^0-9]*([0-9]+).*/$1/;
+
#print "ver: $ver\n";
}
elsif (-f "/etc/UnitedLinux-release")
@@ -2175,8 +2204,21 @@ sub osver
close($relfile);
}
}
- $os = "$os" . "$ver";
- return ($os);
+ if ( $type and $type =~ /all/ ) {
+ if ( $rel ) {
+ return( "$os" . "," . "$ver" . ".$rel" );
+ } else {
+ return( "$os" . "," . "$ver" );
+ }
+ } elsif ( $type and $type =~ /os/ ) {
+ return( $os );
+ } elsif ( $type and $type =~ /version/ ) {
+ return( $ver );
+ } elsif ( $type and $type =~ /release/ ) {
+ return( $rel );
+ } else {
+ return ("$os" . "$ver");
+ }
}
#-----------------------------------------------------------------------------