lagertonne/ifupdown-ng
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Wiki Activity

ifupdown: upgrade dependent interfaces to explicit interfaces if explicitly requested

Browse source
This commit is contained in:
Ariadne Conill 2020-10-21 08:46:47 -06:00
parent e16c24203e
commit 61da61dfdb
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cmd/ifupdown.c
View file

@ -95,7 +95,7 @@ acquire_state_lock(const char *state_path, const char *lifname)
}
bool
skip_interface(struct lif_interface *iface, const char *ifname)
skip_interface(struct lif_interface *iface, const char *ifname, struct lif_dict *state, bool update_state)
{
if (iface->is_template)
{
@ -123,16 +123,23 @@ skip_interface(struct lif_interface *iface, const char *ifname)
if (up && iface->refcount > 0)
{
if (exec_opts.verbose)
fprintf(stderr, "%s: skipping auto interface %s (already configured), use --force to force configuration\n",
argv0, ifname);
fprintf(stderr, "%s: skipping %sinterface %s (already configured), use --force to force configuration\n",
argv0, iface->is_auto ? "auto " : "", ifname);
if (update_state)
{
iface->is_explicit = true;
lif_state_upsert(state, ifname, iface);
}
return true;
}
if (!up && iface->refcount == 0)
{
if (exec_opts.verbose)
fprintf(stderr, "%s: skipping auto interface %s (already deconfigured), use --force to force deconfiguration\n",
argv0, ifname);
fprintf(stderr, "%s: skipping %sinterface %s (already deconfigured), use --force to force deconfiguration\n",
argv0, iface->is_auto ? "auto " : "", ifname);
return true;
}
@ -150,7 +157,7 @@ change_interface(struct lif_interface *iface, struct lif_dict *collection, struc
return false;
}
if (skip_interface(iface, ifname))
if (skip_interface(iface, ifname, state, update_state))
{
if (lockfd != -1)
close(lockfd);