interfaces: remove /var/run/booting side effect #5637

interfaces_configure() is unaffected.  While looking at the code
decided to make all callers except newwanip and vxlan hook use
$reload to request a full reconfiguration as that is most likely
what the user would expect in these cases in the first place.
This commit is contained in:
Franco Fichtner 2022-06-14 14:14:21 +02:00
parent d8553a0e7f
commit 90f471cb19
5 changed files with 5 additions and 5 deletions

View File

@ -2324,7 +2324,7 @@ function interface_configure($verbose = false, $interface = 'wan', $reload = fal
echo "done.\n";
}
if (!file_exists('/var/run/booting') && $reload) {
if ($reload) {
system_routing_configure($verbose, $interface);
plugins_configure('ipsec', $verbose, array($interface));
plugins_configure('dhcp', $verbose);

View File

@ -225,7 +225,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
ifgroup_setup();
$confif = convert_real_interface_to_friendly_interface_name($bridge['bridgeif']);
if ($confif != '') {
interface_configure(false, $confif);
interface_configure(false, $confif, true);
}
header(url_safe('Location: /interfaces_bridge.php'));
exit;

View File

@ -128,7 +128,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
ifgroup_setup();
$confif = convert_real_interface_to_friendly_interface_name($gif['gifif']);
if ($confif != '') {
interface_configure(false, $confif);
interface_configure(false, $confif, true);
}
header(url_safe('Location: /interfaces_gif.php'));
exit;

View File

@ -98,7 +98,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
ifgroup_setup();
$confif = convert_real_interface_to_friendly_interface_name($gre['greif']);
if ($confif != '') {
interface_configure(false, $confif);
interface_configure(false, $confif, true);
}
header(url_safe('Location: /interfaces_gre.php'));
exit;

View File

@ -169,7 +169,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
_interfaces_lagg_configure($lagg);
$confif = convert_real_interface_to_friendly_interface_name($lagg['laggif']);
if ($confif != '') {
interface_configure(false, $confif);
interface_configure(false, $confif, true);
}
header(url_safe('Location: /interfaces_lagg.php'));
exit;