michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-25 15:40:30 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Handle new capped-cpu output format

Browse Source
This commit is contained in:
Jamie Cameron
2010-01-05 23:52:20 -08:00
parent d1377b3bef
commit ca5afdfcb2
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
zones/zones-lib.pl
View File

@@ -10,6 +10,8 @@ use WebminCore;
%thing_key_map = ( "net" => "address",
"fs" => "dir",
"inherit-pkg-dir" => "dir",
"capped-cpu" => "ncpus",
"capped-memory" => "physical",
"rctl" => "name",
"attr" => "name",
"device" => "match" );
@@ -64,7 +66,8 @@ foreach $p ("zonepath", "autoboot", "pool", "brand") {
}
# Add lists of things
foreach $r ("fs", "inherit-pkg-dir", "net", "device", "rctl", "attr") {
foreach $r ("fs", "inherit-pkg-dir", "net", "device", "rctl", "attr",
"capped-cpu", "capped-memory") {
local @lines = &get_zonecfg_output($zone, "info $r");
local ($l, $thing);
foreach $l (@lines) {
@@ -75,9 +78,11 @@ foreach $r ("fs", "inherit-pkg-dir", "net", "device", "rctl", "attr") {
'keyzone' => $zone };
push(@{$zinfo->{$r}}, $thing);
}
elsif ($l =~ /^\s+([^:]+):\s*\[(.*)\]/ ||
$l =~ /^\s+([^:]+):\s*"(.*)"/ ||
$l =~ /^\s+([^:]+):\s*(.*)/) {
elsif ($l =~ /^\s+\[([^:]+):\s*"(.*)"\]/ ||
$l =~ /^\s+\[([^:]+):\s*(.*)\]/ ||
$l =~ /^\s+([^:]+):\s*\[(.*)\]/ ||
$l =~ /^\s+([^:]+):\s*"(.*)"/ ||
$l =~ /^\s+([^:]+):\s*(.*)/) {
# An attribute of a thing
if (defined($thing->{$1})) {
# Multiple values!