more duplicate variables

[rsbs2] / rsbs2.pl

diff --git a/rsbs2.pl b/rsbs2.pl
index a78ee76b1b2d3009a85a023c84c735a09c28fb12..e25808a2e3814264db4950b68aee0697dcd794d2 100755 (executable)
--- a/rsbs2.pl
+++ b/rsbs2.pl
@@ -10,12 +10,12 @@ my $ua = LWP::UserAgent->new;
 my $sid;
 my $host;
 my $poweronms=200;
-my $poweroffms=4500;
+my $poweroffms=5000;
 my $verbose = 0;
 
 my @fw_vars = qw(ENABLE_LAN_AUTONEG ENABLE_LAN_100 ENABLE_LAN_FDUPLEX GATEWAY
        IP_ADDRESS NETMASK TFTP_FIRMWARE_FILE TFTP_ADDR_FIRMWARE ENABLE_DHCP
-       ENABLE_DNS DNS_SERVER DNS_DOMAIN_NAME DHCP_CONFIGURE_DNS
+       ENABLE_DNS DNS_SERVER DNS_DOMAIN_NAME
        ACCESS_CONTROL_SERVER_1 ACCESS_CONTROL_SERVER_2 ACCESS_CONTROL_SERVERS
        ACPI_DISABLE_BIOS_SCAN ACPI_FORCE_RSDP_ADDRESS ACPI_FORCE_RSDT_ADDRESS
        ACPI_RSDP_BIOS_ROM_ADDRESS ACPI_SCAN_DELAY_SECONDS AMR_AUTH_METHOD
@@ -35,7 +35,7 @@ my @fw_vars = qw(ENABLE_LAN_AUTONEG ENABLE_LAN_100 ENABLE_LAN_FDUPLEX GATEWAY
        CONSOLE_VIDEO_PARAM_MODE CONTACT CONTACT_PHONE CRIT_TEMP_SHUTDOWN
        CRIT_VOLT_SHUTDOWN DHCP_ADD_EXTENSION DHCP_ADD_SERIAL
        DHCP_CONFIGURE_DNS DHCP_HOSTNAME_EXT DHCP_SERVER DHCP_USE_CARDNAME
-       DIAG_URL DNS_DOMAIN_NAME DNS_SERVER ENABLE_ANON_IPMI ENABLE_ANON_PCI
+       DIAG_URL ENABLE_ANON_IPMI ENABLE_ANON_PCI
        ENABLE_ANON_WEB ENABLE_AVR_CHIP_DETECT ENABLE_BMC_AUTODETECT
        ENABLE_BMC_TIMESYNC ENABLE_CRTC_FETCH ENABLE_DHCP ENABLE_DHCP_HOSTNAME
        ENABLE_DNS ENABLE_DS_CONNECTIVITY ENABLE_IO_UART_DECODER ENABLE_LAN_100
@@ -159,6 +159,8 @@ sub _getprop {
 
        my $reqstr='<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="propget"><PROPLIST><PROP NAME="'.$property.'"/></PROPLIST></REQ></RMCSEQ>';
        my $resp = _req($reqstr);
+
+       print "get: ${property}\n" if ($verbose);
        
        if ($resp->{RESP}->{RC} ne '0x0') {
                $resp->{RESP}->{RC};
@@ -195,7 +197,7 @@ sub setprop {
        if ($res->{RESP}->{RC} ne '0x0') {
                print "Error setting ${property} to ${value}: ".$res->{RESP}->{RC}."\n";
        } else {
-               print "${property}: ${oldval} -> ${value}\n" if ($verbose);
+               print "${property}: ${oldval} -> ${value}\n";
        }
 }
 
@@ -430,7 +432,7 @@ while (defined($ARGV[0])) {
        }
 }
 
-if (!defined(${$Config{$hostalias}}{'host'})) {
+if ($valid_arg && (!defined(${$Config{$hostalias}}{'host'}))) {
        $valid_arg = 0;
 }
 
@@ -483,11 +485,29 @@ if (@sprop) {
 }
 
 if ($save ne '') {
-       print "save: implement me!\n";
+       my @dontsave = qw(ENABLE_LAN_AUTONEG ENABLE_LAN_100 ENABLE_LAN_FDUPLEX GATEWAY
+               IP_ADDRESS NETMASK TFTP_FIRMWARE_FILE TFTP_ADDR_FIRMWARE ENABLE_DHCP);
+
+       open (SAVEFILE, ">${save}") || die "Error opening save-file: $!\n";
+       foreach my $ts (@fw_vars) {
+               next if (grep(/^${ts}$/, @dontsave));
+
+               my $phash = _getprop($ts)->{RESP}->{PROPLIST}->{PROP};
+               next if ($phash->{PERMS} ne 'RW');
+               
+               print SAVEFILE "${ts}=".$phash->{VAL}."\n";
+       }
+       close(SAVEFILE);
 }
 
 if ($load ne '') {
-       print "load: implement me!\n";
+       open (LOADFILE, "<${load}") || die "Error opening load-file: $!\n";
+       while(<LOADFILE>) {
+               chomp;
+               (my $p, my $v) = split(/=/, $_);
+               setprop($p, $v);
+       }
+       close(LOADFILE);
 }
 
 if ($enable_debug ne '') {