diff options
Diffstat (limited to 'gen_ipmi_sensor.pl')
| -rwxr-xr-x | gen_ipmi_sensor.pl | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/gen_ipmi_sensor.pl b/gen_ipmi_sensor.pl index 8dceaf4..a54341e 100755 --- a/gen_ipmi_sensor.pl +++ b/gen_ipmi_sensor.pl @@ -105,13 +105,18 @@ foreach my $target (sort keys %{$targetObj->getAllTargets()}) $obmcPath = Util::getObmcName(\@inventory,$path); #if unable to get the obmc path then get from yaml if (not defined $obmcPath) { - my @pathelements =split(/\//,$path); - foreach my $elem (@pathelements) { - #split element-instance_number - my ($elemName,$elemNum) = split(/-([^-]+)$/,$elem); - if((defined $elemName) and ($elemName eq "proc_socket")) { - $obmcPath = $sensorTypeConfig->{$sensorType}->{"path"}."occ".$elemNum; - last; + if ($path eq "/sys-0") { + $obmcPath = $sensorTypeConfig->{$sensorType}->{"path"}; + } + else { + my @pathelements =split(/\//,$path); + foreach my $elem (@pathelements) { + #split element-instance_number + my ($elemName,$elemNum) = split(/-([^-]+)$/,$elem); + if ((defined $elemName) and ($elemName eq "proc_socket")) { + $obmcPath = $sensorTypeConfig->{$sensorType}->{"path"}."occ".$elemNum; + last; + } } } } @@ -144,6 +149,12 @@ sub writeToFile print $fh " sensorReadingType: ".$sensorReadingType."\n"; print $fh " updateInterface: ".$sensorTypeConfig->{$sensorType}->{"updateInterface"}."\n"; + if (defined($sensorTypeConfig->{$sensorType}->{"readingType"})) { + print $fh " readingType: ".$sensorTypeConfig->{$sensorType}->{"readingType"}."\n"; + } + if (defined($sensorTypeConfig->{$sensorType}->{"byteOffset"})) { + print $fh " byteOffset: ".$sensorTypeConfig->{$sensorType}->{"byteOffset"}."\n"; + } print $fh " interfaces:"."\n"; my $interfaces = $sensorTypeConfig->{$sensorType}->{"interfaces"}; |
