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

ifupdown: implement --force

Browse source
This commit is contained in:
Ariadne Conill 2020-09-08 19:17:00 -06:00
parent efe9b60e37
commit b514d31c26
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/ifupdown.c
View file

@ -96,6 +96,9 @@ acquire_state_lock(const char *state_path, const char *lifname)
bool bool
skip_interface(struct lif_interface *iface, const char *ifname) skip_interface(struct lif_interface *iface, const char *ifname)
{ {
if (exec_opts.force)
return false;
if (up && iface->refcount > 0) if (up && iface->refcount > 0)
{ {
fprintf(stderr, "%s: skipping %s (already configured), use --force to force configuration\n", fprintf(stderr, "%s: skipping %s (already configured), use --force to force configuration\n",

5
cmd/multicall-exec-options.c
View file

@ -68,13 +68,14 @@ set_no_lock(const char *opt_arg)
} }
static void static void
no_op(const char *opt_arg) set_force(const char *opt_arg)
{ {
(void) opt_arg; (void) opt_arg;
exec_opts.force = true;
} }
static struct if_option exec_options[] = { static struct if_option exec_options[] = {
{'f', "force", NULL, "force (de)configuration", false, no_op}, {'f', "force", NULL, "force (de)configuration", false, set_force},
{'i', "interfaces", "interfaces FILE", "use FILE for interface definitions", true, set_interfaces_file}, {'i', "interfaces", "interfaces FILE", "use FILE for interface definitions", true, set_interfaces_file},
{'l', "no-lock", NULL, "do not use a lockfile to serialize state changes", false, set_no_lock}, {'l', "no-lock", NULL, "do not use a lockfile to serialize state changes", false, set_no_lock},
{'n', "no-act", NULL, "do not actually run any commands", false, set_no_act}, {'n', "no-act", NULL, "do not actually run any commands", false, set_no_act},

1
libifupdown/execute.h
View file

@ -23,6 +23,7 @@ struct lif_execute_opts {
bool verbose; bool verbose;
bool mock; bool mock;
bool no_lock; bool no_lock;
bool force;
const char *executor_path; const char *executor_path;
const char *interfaces_file; const char *interfaces_file;
const char *state_file; const char *state_file;