Mercurial > hg > dhcpcd
changeset 948:4a8387866485 draft
Don't spam on startup about unsupported interfaces if quiet.
| author | Roy Marples <roy@marples.name> |
|---|---|
| date | Fri, 05 Sep 2008 15:46:02 +0000 |
| parents | fdfd5b67ebc8 |
| children | 6faf186aaa97 |
| files | dhcpcd.c if-options.c if-options.h net.c |
| diffstat | 4 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/dhcpcd.c Fri Sep 05 15:28:08 2008 +0000 +++ b/dhcpcd.c Fri Sep 05 15:46:02 2008 +0000 @@ -1004,6 +1004,10 @@ case 'n': sig = SIGALRM; break; + case 'q': + setloglevel(LOG_WARNING); + options |= DHCPCD_QUIET; + break; case 'x': sig = SIGTERM; break; @@ -1062,7 +1066,7 @@ exit(EXIT_FAILURE); } } else { - if (errno != EEXIST) + if (errno != ENOENT) logger(LOG_ERR, "open_control: %m"); } }
--- a/if-options.c Fri Sep 05 15:28:08 2008 +0000 +++ b/if-options.c Fri Sep 05 15:46:02 2008 +0000 @@ -261,6 +261,7 @@ case 'd': /* FALLTHROUGH */ case 'k': /* FALLTHROUGH */ case 'n': /* FALLTHROUGH */ + case 'q': /* FALLTHROUGH */ case 'x': /* FALLTHROUGH */ case 'B': /* FALLTHROUGH */ case 'T': /* We need to handle non interface options */ @@ -325,9 +326,6 @@ case 'p': ifo->options |= DHCPCD_PERSISTENT; break; - case 'q': - setloglevel(LOG_WARNING); - break; case 's': ifo->options |= DHCPCD_INFORM; ifo->options |= DHCPCD_PERSISTENT;
--- a/if-options.h Fri Sep 05 15:28:08 2008 +0000 +++ b/if-options.h Fri Sep 05 15:46:02 2008 +0000 @@ -64,7 +64,8 @@ #define DHCPCD_HOSTNAME (1 << 18) #define DHCPCD_CLIENTID (1 << 19) #define DHCPCD_LINK (1 << 20) -#define DHCPCD_BACKGROUND (1 << 21) +#define DHCPCD_QUIET (1 << 21) +#define DHCPCD_BACKGROUND (1 << 22) extern const struct option cf_options[];
--- a/net.c Fri Sep 05 15:28:08 2008 +0000 +++ b/net.c Fri Sep 05 15:46:02 2008 +0000 @@ -234,7 +234,11 @@ iface->hwlen = INFINIBAND_ADDR_LEN; break; default: - logger(LOG_ERR, "%s: unsupported media family", iface->name); + /* Don't needlessly spam console on startup */ + if (!(options & DHCPCD_MASTER && + !(options & DHCPCD_DAEMONISED) && + options & DHCPCD_QUIET)) + logger(LOG_ERR, "%s: unsupported media family", iface->name); goto eexit; } memcpy(iface->hwaddr, ifr.ifr_hwaddr.sa_data, iface->hwlen);