Split $os->{version} into $os->{major_version} and $os->{minor_version}

diff --git a/inspector/virt-inspector.pl b/inspector/virt-inspector.pl
index 09edbae..9148a48 100755 (executable)
--- a/inspector/virt-inspector.pl
+++ b/inspector/virt-inspector.pl
@@ -357,7 +357,9 @@ sub output_text_os
 
     print $os->{os}, " " if exists $os->{os};
     print $os->{distro}, " " if exists $os->{distro};
 
     print $os->{os}, " " if exists $os->{os};
     print $os->{distro}, " " if exists $os->{distro};

-    print $os->{version}, " " if exists $os->{version};
+    print $os->{major_version} if exists $os->{major_version};
+    print ".", $os->{minor_version} if exists $os->{minor_version};
+    print " ";

     print "on ", $os->{root_device}, ":\n";
 
     print __"  Mountpoints:\n";
     print "on ", $os->{root_device}, ":\n";
 
     print __"  Mountpoints:\n";


@@ -448,7 +450,8 @@ sub output_xml_os
 
     foreach ( [ "name" => "os" ],
               [ "distro" => "distro" ],
 
     foreach ( [ "name" => "os" ],
               [ "distro" => "distro" ],

-              [ "version" => "version" ],
+              [ "major_version" => "major_version" ],
+              [ "minor_version" => "minor_version" ],

               [ "package_format" => "package_format" ],
               [ "package_management" => "package_management" ],
               [ "root" => "root_device" ] ) {
               [ "package_format" => "package_format" ],
               [ "package_management" => "package_management" ],
               [ "root" => "root_device" ] ) {

diff --git a/perl/lib/Sys/Guestfs/Lib.pm b/perl/lib/Sys/Guestfs/Lib.pm
index a581def..5d48ba8 100644 (file)
--- a/perl/lib/Sys/Guestfs/Lib.pm
+++ b/perl/lib/Sys/Guestfs/Lib.pm
@@ -489,10 +489,15 @@ The package format used by the guest distribution. One of: "rpm", "dpkg".
 The package management tool used by the guest distribution. One of: "rhn",
 "yum", "apt".
 
 The package management tool used by the guest distribution. One of: "rhn",
 "yum", "apt".
 

-=item osversion
+=item os_major_version

 
 (For root partitions only).
 
 (For root partitions only).

-Operating system version.
+Operating system major version number.
+
+=item os_minor_version
+
+(For root partitions only).
+Operating system minor version number.

 
 =item fstab
 
 
 =item fstab
 


@@ -619,13 +624,15 @@ sub _check_linux_root
     my $r = shift;
 
     # Look into /etc to see if we recognise the operating system.
     my $r = shift;
 
     # Look into /etc to see if we recognise the operating system.

-    if ($g->is_file ("/etc/redhat-release")) {
+    # N.B. don't use $g->is_file here, because it might be a symlink
+    if ($g->exists ("/etc/redhat-release")) {

         $r->{package_format} = "rpm";
 
        $_ = $g->cat ("/etc/redhat-release");
         $r->{package_format} = "rpm";
 
        $_ = $g->cat ("/etc/redhat-release");

-       if (/Fedora release (\d+\.\d+)/) {
+       if (/Fedora release (\d+)(?:\.(\d+))?/) {

            $r->{osdistro} = "fedora";
            $r->{osdistro} = "fedora";

-           $r->{osversion} = "$1";
+           $r->{os_major_version} = "$1";
+           $r->{os_minor_version} = "$2" if(defined($2));

            $r->{package_management} = "yum";
        }
         
            $r->{package_management} = "yum";
        }
         


@@ -650,16 +657,23 @@ sub _check_linux_root
             else { die };
 
             if (/$distro.*release (\d+).*Update (\d+)/) {
             else { die };
 
             if (/$distro.*release (\d+).*Update (\d+)/) {

-                $r->{osversion} = "$1.$2";
+                $r->{os_major_version} = "$1";
+                $r->{os_minor_version} = "$2";

             }
 
             }
 

-            elsif (/$distro.*release (\d+(?:\.(?:\d+))?)/) {
-                $r->{osversion} = "$1";
+            elsif (/$distro.*release (\d+)(?:\.(\d+))?/) {
+                $r->{os_major_version} = "$1";
+
+                if(defined($2)) {
+                    $r->{os_minor_version} = "$2";
+                } else {
+                    $r->{os_minor_version} = "0";
+                }

             }
 
             # Package management in RHEL changed in version 5
             if ($r->{osdistro} eq "rhel") {
             }
 
             # Package management in RHEL changed in version 5
             if ($r->{osdistro} eq "rhel") {

-                if ($r->{osversion} >= 5) {
+                if ($r->{os_major_version} >= 5) {

                     $r->{package_management} = "yum";
                 } else {
                     $r->{package_management} = "rhn";
                     $r->{package_management} = "yum";
                 } else {
                     $r->{package_management} = "rhn";


@@ -675,9 +689,10 @@ sub _check_linux_root
         $r->{package_management} = "apt";
 
        $_ = $g->cat ("/etc/debian_version");
         $r->{package_management} = "apt";
 
        $_ = $g->cat ("/etc/debian_version");

-       if (/(\d+\.\d+)/) {
+       if (/(\d+)\.(\d+)/) {

            $r->{osdistro} = "debian";
            $r->{osdistro} = "debian";

-           $r->{osversion} = "$1";
+           $r->{os_major_version} = "$1";
+           $r->{os_minor_version} = "$2";

        } else {
            $r->{osdistro} = "debian";
        }
        } else {
            $r->{osdistro} = "debian";
        }


@@ -866,9 +881,13 @@ Operating system type, eg. "linux", "windows".
 
 Operating system distribution, eg. "debian".
 
 
 Operating system distribution, eg. "debian".
 

-=item version
+=item major_version
+
+Operating system major version, eg. "4".
+
+=item minor_version

 
 

-Operating system version, eg. "4.0".
+Operating system minor version, eg "3".

 
 =item root
 
 
 =item root
 


@@ -934,7 +953,10 @@ sub _get_os_version
 
     $r->{os} = $r->{root}->{fsos} if exists $r->{root}->{fsos};
     $r->{distro} = $r->{root}->{osdistro} if exists $r->{root}->{osdistro};
 
     $r->{os} = $r->{root}->{fsos} if exists $r->{root}->{fsos};
     $r->{distro} = $r->{root}->{osdistro} if exists $r->{root}->{osdistro};

-    $r->{version} = $r->{root}->{osversion} if exists $r->{root}->{osversion};
+    $r->{major_version} = $r->{root}->{os_major_version}
+        if exists $r->{root}->{os_major_version};
+    $r->{minor_version} = $r->{root}->{os_minor_version}
+        if exists $r->{root}->{os_minor_version};

     $r->{package_format} = $r->{root}->{package_format}
         if exists $r->{root}->{package_format};
     $r->{package_management} = $r->{root}->{package_management}
     $r->{package_format} = $r->{root}->{package_format}
         if exists $r->{root}->{package_format};
     $r->{package_management} = $r->{root}->{package_management}