fileaccess cleanups

[rsbs2] / rsbs2.pl

diff --git a/rsbs2.pl b/rsbs2.pl
index e25808a2e3814264db4950b68aee0697dcd794d2..a481f456bac5e25dd6d379b45bffed595f107efc 100755 (executable)
--- a/rsbs2.pl
+++ b/rsbs2.pl
@@ -38,7 +38,7 @@ my @fw_vars = qw(ENABLE_LAN_AUTONEG ENABLE_LAN_100 ENABLE_LAN_FDUPLEX GATEWAY
        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
+       ENABLE_DS_CONNECTIVITY ENABLE_IO_UART_DECODER ENABLE_LAN_100
        ENABLE_LAN_AUTONEG ENABLE_LAN_FDUPLEX ENABLE_MEM_UART_DECODER
        ENABLE_PPP ENABLE_REMOTE_FLOPPY_BOOT ENABLE_SELF_DELETE
        ENABLE_SERIAL_DBG ETHDRIVER_SID EXPROM_BANNER EXPROM_EBDA_COMPATIBILITY
@@ -151,7 +151,7 @@ sub _req {
        $request->content($xml);
        $response = $ua->request($request);
        die("Error in request: " . $response->status_line . "\n") unless ($response->is_success);
-       XMLin($response->content);
+       XMLin($response->content, SuppressEmpty => '');
 }
 
 sub _getprop {
@@ -196,8 +196,10 @@ sub setprop {
 
        if ($res->{RESP}->{RC} ne '0x0') {
                print "Error setting ${property} to ${value}: ".$res->{RESP}->{RC}."\n";
+               undef;
        } else {
-               print "${property}: ${oldval} -> ${value}\n";
+               print "${property}: ${oldval} -> ${value}\n" if ($verbose);
+               $oldval;
        }
 }
 
@@ -480,15 +482,21 @@ if (@gprop) {
 if (@sprop) {
        foreach my $p (@sprop) {
                (my $pr, $v) = split(/=/,$p,2);
-               setprop($pr, $v);
+               my $oldval = setprop($pr, $v);
+               if (defined($oldval)) {
+                       print "${pr}: ${oldval} -> ${v}\n" if (!$verbose);
+               }
        }
 }
 
 if ($save ne '') {
-       my @dontsave = qw(ENABLE_LAN_AUTONEG ENABLE_LAN_100 ENABLE_LAN_FDUPLEX GATEWAY
-               IP_ADDRESS NETMASK TFTP_FIRMWARE_FILE TFTP_ADDR_FIRMWARE ENABLE_DHCP);
+       my @dontsave = qw(ENABLE_LAN_AUTONEG ENABLE_LAN_100 ENABLE_LAN_FDUPLEX
+       GATEWAY IP_ADDRESS NETMASK TFTP_FIRMWARE_FILE TFTP_ADDR_FIRMWARE
+       ENABLE_DHCP MAC_ADDRESS LAST_CARD_NAME LAST_ENABLE_DHCP LAST_GATEWAY
+       LAST_IP_ADDRESS LAST_NETMASK);
 
        open (SAVEFILE, ">${save}") || die "Error opening save-file: $!\n";
+       print STDERR "saving" if (!$verbose);
        foreach my $ts (@fw_vars) {
                next if (grep(/^${ts}$/, @dontsave));
 
@@ -496,18 +504,27 @@ if ($save ne '') {
                next if ($phash->{PERMS} ne 'RW');
                
                print SAVEFILE "${ts}=".$phash->{VAL}."\n";
+               print STDERR "." if (!$verbose);
        }
        close(SAVEFILE);
+       print STDERR "done\n" if (!$verbose);
 }
 
 if ($load ne '') {
        open (LOADFILE, "<${load}") || die "Error opening load-file: $!\n";
+       print STDERR "loading" if (!$verbose);
        while(<LOADFILE>) {
                chomp;
                (my $p, my $v) = split(/=/, $_);
                setprop($p, $v);
+               print STDERR "." if (!$verbose);
        }
        close(LOADFILE);
+       print STDERR "done\n" if (!$verbose);
+       print "Settings loaded, resetting board...\n";
+       my $reqstr='<?XML version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="boardreset"></REQ></RMCSEQ>';
+       _req($reqstr);
+       exit(0);
 }
 
 if ($enable_debug ne '') {