projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Don't touch /etc/xensource/network.conf on upgrade.
[openvswitch]
/
utilities
/
ovs-discover.c
diff --git
a/utilities/ovs-discover.c
b/utilities/ovs-discover.c
index 3830e0739929decf44bde819efc22b5f436ff1d0..534dd7747a1619b71d30021ce64de8e09b47dcb9 100644
(file)
--- a/
utilities/ovs-discover.c
+++ b/
utilities/ovs-discover.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010
, 2011
Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-33,9
+33,9
@@
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
-
#include "vlog.h"
#include "vlog.h"
-#define THIS_MODULE VLM_ovs_discover
+
+VLOG_DEFINE_THIS_MODULE(ovs_discover);
struct iface {
const char *name;
struct iface {
const char *name;
@@
-77,8
+77,6
@@
main(int argc, char *argv[])
proctitle_init(argc, argv);
set_program_name(argv[0]);
proctitle_init(argc, argv);
set_program_name(argv[0]);
- time_init();
- vlog_init();
parse_options(argc, argv);
argc -= optind;
parse_options(argc, argv);
argc -= optind;
@@
-282,7
+280,8
@@
parse_options(int argc, char *argv[])
OPT_EXIT_WITHOUT_BIND,
OPT_EXIT_AFTER_BIND,
OPT_NO_DETACH,
OPT_EXIT_WITHOUT_BIND,
OPT_EXIT_AFTER_BIND,
OPT_NO_DETACH,
- VLOG_OPTION_ENUMS
+ VLOG_OPTION_ENUMS,
+ DAEMON_OPTION_ENUMS
};
static struct option long_options[] = {
{"accept-vconn", required_argument, 0, OPT_ACCEPT_VCONN},
};
static struct option long_options[] = {
{"accept-vconn", required_argument, 0, OPT_ACCEPT_VCONN},
@@
-399,6
+398,6
@@
usage(void)
"running\n"
" -h, --help display this help message\n"
" -V, --version display version information\n",
"running\n"
" -h, --help display this help message\n"
" -V, --version display version information\n",
- ovs_rundir, program_name);
+ ovs_rundir
()
, program_name);
exit(EXIT_SUCCESS);
}
exit(EXIT_SUCCESS);
}