* Moved up when the reboot happens, when it's needed, avoiding a network reload when a reboot is going to happen anyway.

Signed-off-by: Digimer <digimer@alteeve.ca>
main
Digimer 4 years ago
parent de94ce4fe8
commit 629c2b8e8c
  1. 14
      tools/anvil-configure-host

@ -1196,6 +1196,13 @@ sub reconfigure_network
} }
} }
# If we should reset, do so now.
if ($anvil->data->{sys}{reboot})
{
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "log_0631"});
do_reboot($anvil);
}
if ($changes) if ($changes)
{ {
# Re-read the config # Re-read the config
@ -1222,13 +1229,6 @@ sub reconfigure_network
} }
} }
# If we should reset, do so now.
if ($anvil->data->{sys}{reboot})
{
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, 'print' => 1, key => "log_0631"});
do_reboot($anvil);
}
# Wait for a DB connection. We'll wait up to 130 seconds, as sometimes it takes a while for the network # Wait for a DB connection. We'll wait up to 130 seconds, as sometimes it takes a while for the network
# to start routing traffic. # to start routing traffic.
my $wait_until = time + 130; my $wait_until = time + 130;

Loading…
Cancel
Save