Skip to content

Commit

Permalink
lldpd: Remove the '-N' command-line flag
Browse files Browse the repository at this point in the history
Too many flags being added, use of configuration file is prefered.

Signed-off-by: Jonas Johansson <jonasj76@gmail.com>
  • Loading branch information
jonasj76 committed Apr 9, 2014
1 parent ce347d2 commit dfa181a
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions src/daemon/lldpd.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ usage(void)
fprintf(stderr, "-k Disable advertising of kernel release, version, machine.\n");
fprintf(stderr, "-S descr Override the default system description.\n");
fprintf(stderr, "-P name Override the default hardware platform.\n");
fprintf(stderr, "-N name Override the default system name.\n");
fprintf(stderr, "-m IP Specify the IPv4 management addresses of this system.\n");
fprintf(stderr, "-u file Specify the Unix-domain socket used for communication with lldpctl(8).\n");
fprintf(stderr, "-H mode Specify the behaviour when detecting multiple neighbors.\n");
Expand Down Expand Up @@ -1275,15 +1274,14 @@ lldpd_main(int argc, char *argv[], char *envp[])
char *cidp = NULL;
char *interfaces = NULL;
char *popt, opts[] =
"H:vhkrdD:xX:m:u:4:6:I:C:p:M:P:N:S:iL:@ ";
"H:vhkrdD:xX:m:u:4:6:I:C:p:M:P:S:iL:@ ";
int i, found, advertise_version = 1;
#ifdef ENABLE_LLDPMED
int lldpmed = 0, noinventory = 0;
int enable_fast_start = 1;
#endif
char *descr_override = NULL;
char *platform_override = NULL;
char *hostname_override = NULL;
char *lsb_release = NULL;
const char *lldpcli = LLDPCLI_PATH;
int smart = 15;
Expand Down Expand Up @@ -1390,9 +1388,6 @@ lldpd_main(int argc, char *argv[], char *envp[])
free(platform_override);
platform_override = strdup(optarg);
break;
case 'N':
hostname_override = strdup(optarg);
break;
case 'H':
smart = atoi(optarg);
break;
Expand Down Expand Up @@ -1553,9 +1548,6 @@ lldpd_main(int argc, char *argv[], char *envp[])
if (platform_override)
cfg->g_config.c_platform = platform_override;

if (hostname_override)
cfg->g_config.c_hostname = hostname_override;

/* Set system capabilities */
log_debug("main", "set system capabilities");
if ((lchassis = (struct lldpd_chassis*)
Expand Down

0 comments on commit dfa181a

Please sign in to comment.