[Resmon-devel] [resmon commit] r426 - trunk/lib/Core

svn-commit at lists.omniti.com svn-commit at lists.omniti.com
Tue Aug 3 22:11:40 EDT 2010


Author: ballen
Date: 2010-08-03 22:11:40 -0400 (Tue, 03 Aug 2010)
New Revision: 426

Modified:
   trunk/lib/Core/Zoneinfo.pm
Log:
tid13333 newlines in zone array?

Modified: trunk/lib/Core/Zoneinfo.pm
===================================================================
--- trunk/lib/Core/Zoneinfo.pm	2010-07-29 15:17:54 UTC (rev 425)
+++ trunk/lib/Core/Zoneinfo.pm	2010-08-04 02:11:40 UTC (rev 426)
@@ -92,6 +92,7 @@
     # Build the list of non-global zones
     my $zonelist = run_command("$zoneadm list");
     my @zones = grep {!/^global$/} split(/\n/, $zonelist);
+    chomp $zones;
     my $zones = join(':', @zones);
 
     # Get stuff.  Start with the current list of mounts and test each zonepath
@@ -113,14 +114,16 @@
 	    chomp $output;
 	    my @result = split(/:\s*/, $output);
 	    my $path = $result[1];
-	    my $dataset = $mounts->{$path};
+	    chomp $path;
+
+	    my $dataset = $path;
 	    if ($dataset) {
 	      my $creation = run_command("$zfs get -H -o value -p creation $dataset");
 	      chomp $creation;
 	      $status->{"${zone}_creation"}   = [$creation, "i"];
       }
 	    else {
-	      $dataset = "Not a mountpoint";
+	      $dataset = undef;
 	    }
 
 	    # Store the values



More information about the Resmon-devel mailing list