X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/5c99fed3e4c39ecb4ae9bd72805c411966ffdb4a..HEAD:/rsbs2.pl
diff --git a/rsbs2.pl b/rsbs2.pl
index c835c0d..76f745b 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");
}
@@ -412,7 +427,7 @@ sub show_sensors {
print $sensor->{NAME}.": ".$sensor->{VAL}.$sensor->{UNITS};
my @info = ();
- foreach my $field qw(MIN MAX LOW_NON_CRITICAL UPPER_NON_CRITICAL LOW_CRITICAL UPPER_CRITICAL) {
+ foreach my $field (qw(MIN MAX LOW_NON_CRITICAL UPPER_NON_CRITICAL LOW_CRITICAL UPPER_CRITICAL)) {
if ($sensor->{$field} ne '') {
push @info, "${field}: ".$sensor->{$field}.$sensor->{UNITS};
}
@@ -477,7 +492,8 @@ sub status {
sub spawn_gui {
my $base = shift;
- open(APPLET,"|appletviewer -J-Djava.security.policy=applet.policy /dev/stdin");
+ $ENV{'AWT_TOOLKIT'} = 'MToolkit';
+ open(APPLET,"|appletviewer -J-Djava.security.policy=applet.policy -J-Djava.net.preferIPv4Stack=true /dev/stdin");
print APPLET 'RSB S2 User Interface';
print APPLET '';
print APPLET '