X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/fc0c5f312a0aaa0dd3803786a6c20489d90d0321..9299770a1ad1f8c06c34338c0c4dd7907eb20882:/rsbs2.pl?ds=inline diff --git a/rsbs2.pl b/rsbs2.pl index fcd433e..69272ca 100755 --- a/rsbs2.pl +++ b/rsbs2.pl @@ -219,8 +219,9 @@ sub serveraction { my $pmode = 2; - setprop("SERVER_HARD_RESET_VIA_IPMI", "FALSE"); - setprop("SERVER_POWER_CHANGE_VIA_IPMI", "FALSE"); + #setprop("SERVER_HARD_RESET_VIA_IPMI", "FALSE"); + #setprop("SERVER_POWER_CHANGE_VIA_IPMI", "FALSE"); + #PM Mode setprop("SERVER_POWER_ON_MODE", sprintf("0x%x", $pmode)); setprop("SERVER_POWER_OFF_MODE", sprintf("0x%x", $pmode)); @@ -235,23 +236,37 @@ sub serveraction { } sub powerup { - print "powerup\n" if ($verbose); - setprop("SERVER_POWER_ON_PULSE_MS", sprintf("0x%x", $poweronms)); - setprop("SERVER_POWER_OFF_PULSE_MS", "0x0"); - serveraction("powercycle"); + if (_getprop("SERVER_POWER_CHANGE_VIA_IPMI")->{PROPLIST}->{PROP}->{VAL} eq "TRUE") { + print "powerup via IPMI\n" if ($verbose); + serveraction("powerup"); + } else { + print "powerup via relay (hack)\n" if ($verbose); + setprop("SERVER_POWER_ON_PULSE_MS", sprintf("0x%x", $poweronms)); + setprop("SERVER_POWER_OFF_PULSE_MS", "0x0"); + serveraction("powercycle"); + } } sub powerdown { - print "powerdown\n" if ($verbose); - setprop("SERVER_POWER_ON_PULSE_MS", "0x0"); - setprop("SERVER_POWER_OFF_PULSE_MS", sprintf("0x%x", $poweroffms)); - serveraction("powercycle"); + if (_getprop("SERVER_POWER_CHANGE_VIA_IPMI")->{PROPLIST}->{PROP}->{VAL} eq "TRUE") { + print "powerdown via IPMI\n" if ($verbose); + serveraction("powerdown"); + } else { + print "powerdown via relay (hack)\n" if ($verbose); + setprop("SERVER_POWER_ON_PULSE_MS", "0x0"); + setprop("SERVER_POWER_OFF_PULSE_MS", sprintf("0x%x", $poweroffms)); + serveraction("powercycle"); + } } sub powercycle { - print "powercycle\n" if ($verbose); - setprop("SERVER_POWER_ON_PULSE_MS", sprintf("0x%x", $poweronms)); - setprop("SERVER_POWER_OFF_PULSE_MS", sprintf("0x%x", $poweroffms)); + if (_getprop("SERVER_POWER_CHANGE_VIA_IPMI")->{PROPLIST}->{PROP}->{VAL} eq "TRUE") { + print "powercycle via IPMI\n" if ($verbose); + } else { + print "powercycle via relay\n" if ($verbose); + setprop("SERVER_POWER_ON_PULSE_MS", sprintf("0x%x", $poweronms)); + setprop("SERVER_POWER_OFF_PULSE_MS", sprintf("0x%x", $poweroffms)); + } serveraction("powercycle"); } @@ -385,7 +400,7 @@ sub get_sensors { return; } - my $req = '0x1'; + my $req = ''.$slist->{HANDLE}.''; foreach my $s (@{$slist->{SENSORLIST}->{SENSOR}}) { $req .= ''; } @@ -477,7 +492,7 @@ sub status { sub spawn_gui { my $base = shift; - open(APPLET,"|appletviewer /dev/stdin"); + open(APPLET,"|appletviewer -J-Djava.security.policy=applet.policy /dev/stdin"); print APPLET 'RSB S2 User Interface'; print APPLET ''; print APPLET '';