Skip to content

Commit

Permalink
Merge pull request #657 from mtomaschewski/link-req
Browse files Browse the repository at this point in the history
client: apply global LINK_REQUIRED setting if any
  • Loading branch information
Nirmoy Das committed Jul 11, 2016
2 parents 9516121 + 76a237e commit d776589
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
4 changes: 3 additions & 1 deletion client/suse/compat-suse.c
Expand Up @@ -1609,7 +1609,9 @@ __ni_suse_startmode(const ni_sysconfig_t *sc)
ni_sysconfig_get_integer(sc, "IFPLUGD_PRIORITY", &control->link_priority);
}

if ((value = ni_sysconfig_get_value(sc, "LINK_REQUIRED"))) {
if (!(value = ni_sysconfig_get_value(sc, "LINK_REQUIRED")))
value = ni_sysconfig_get_value(__ni_suse_config_defaults, "LINK_REQUIRED");
if (value) {
/* otherwise assume "auto" */
if (ni_string_eq(value, "yes"))
ni_tristate_set(&control->link_required, TRUE);
Expand Down
13 changes: 13 additions & 0 deletions client/suse/config/sysconfig.config-wicked
Expand Up @@ -7,6 +7,19 @@
#
AUTO6_WAIT_AT_BOOT=""

## Type: list(auto,yes,no)
## Default: "auto"
#
# Permits to specify/modify a global ifcfg default. Use with care!
#
# This settings breaks rules for many things, which require carrier
# before they can start, e.g. L2 link protocols, link authentication,
# ipv4 duplicate address detection, ipv6 duplicate detection will
# happen "post-mortem" and maybe even cause to disable ipv6 at all.
# See also "man ifcfg" for further informations.
#
LINK_REQUIRED="auto"

## Type: string
## Default: ""
#
Expand Down

0 comments on commit d776589

Please sign in to comment.