api network reload: code cleanup

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/API2/Network.pm b/PVE/API2/Network.pm
index d50a808dca0539fa6d0174e41c9f37d3f1403578..ac5571a774eb98741af28f713d5890133ce887d4 100644 (file)
--- a/PVE/API2/Network.pm
+++ b/PVE/API2/Network.pm
@@ -560,14 +560,15 @@ __PACKAGE__->register_method({
 
            rename($new_config_file, $current_config_file) if -e $new_config_file;
 
+           my $frr_config;
            if ($have_sdn) {
                my $network_config = PVE::Network::SDN::generate_etc_network_config();
                PVE::Network::SDN::write_etc_network_config($network_config);
-               my $frr_config = PVE::Network::SDN::generate_frr_config();
+
+               $frr_config = PVE::Network::SDN::generate_frr_config();
                PVE::Network::SDN::write_frr_config($frr_config) if $frr_config;
            }
 
-           my $cmd = ['ifreload', '-a'];
 
            my $err = sub {
                my $line = shift;
@@ -575,9 +576,11 @@ __PACKAGE__->register_method({
                    print "$2 : $line \n";
                }
            };
+           PVE::Tools::run_command(['ifreload', '-a'], errfunc => $err);
 
-           PVE::Tools::run_command($cmd,errfunc => $err);
-           PVE::Tools::run_command(['systemctl', 'reload', 'frr']) if -e "/usr/lib/frr/frr-reload.py";
+           if ($frr_config && -e "/usr/lib/frr/frr-reload.py") {
+               PVE::Tools::run_command(['systemctl', 'reload', 'frr']);
+           }
        };
        return $rpcenv->fork_worker('srvreload', 'networking', $authuser, $worker);
    }});