projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
socket-util: Properly set socket permissions in make_unix_socket().
[openvswitch]
/
vswitchd
/
ovs-vswitchd.c
diff --git
a/vswitchd/ovs-vswitchd.c
b/vswitchd/ovs-vswitchd.c
index 2181e82e67da2d2ae41e62a518d5992282d007a2..b9a24618404c6cd753f7b7bdf1034d8a8ea24ff9 100644
(file)
--- a/
vswitchd/ovs-vswitchd.c
+++ b/
vswitchd/ovs-vswitchd.c
@@
-36,7
+36,6
@@
#include "netdev.h"
#include "ovsdb-idl.h"
#include "poll-loop.h"
#include "netdev.h"
#include "ovsdb-idl.h"
#include "poll-loop.h"
-#include "proc-net-compat.h"
#include "process.h"
#include "signals.h"
#include "stream-ssl.h"
#include "process.h"
#include "signals.h"
#include "stream-ssl.h"
@@
-75,7
+74,6
@@
main(int argc, char *argv[])
process_init();
ovsrec_init();
process_init();
ovsrec_init();
- die_if_already_running();
daemonize_start();
retval = unixctl_server_create(NULL, &unixctl);
daemonize_start();
retval = unixctl_server_create(NULL, &unixctl);
@@
-117,7
+115,6
@@
parse_options(int argc, char *argv[])
enum {
OPT_PEER_CA_CERT = UCHAR_MAX + 1,
OPT_MLOCKALL,
enum {
OPT_PEER_CA_CERT = UCHAR_MAX + 1,
OPT_MLOCKALL,
- OPT_FAKE_PROC_NET,
VLOG_OPTION_ENUMS,
LEAK_CHECKER_OPTION_ENUMS,
OPT_BOOTSTRAP_CA_CERT,
VLOG_OPTION_ENUMS,
LEAK_CHECKER_OPTION_ENUMS,
OPT_BOOTSTRAP_CA_CERT,
@@
-128,7
+125,6
@@
parse_options(int argc, char *argv[])
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
{"mlockall", no_argument, 0, OPT_MLOCKALL},
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
{"mlockall", no_argument, 0, OPT_MLOCKALL},
- {"fake-proc-net", no_argument, 0, OPT_FAKE_PROC_NET},
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
LEAK_CHECKER_LONG_OPTIONS,
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
LEAK_CHECKER_LONG_OPTIONS,
@@
-141,7
+137,6
@@
parse_options(int argc, char *argv[])
{0, 0, 0, 0},
};
char *short_options = long_options_to_short_options(long_options);
{0, 0, 0, 0},
};
char *short_options = long_options_to_short_options(long_options);
- int error;
for (;;) {
int c;
for (;;) {
int c;
@@
-170,14
+165,6
@@
parse_options(int argc, char *argv[])
#endif
break;
#endif
break;
- case OPT_FAKE_PROC_NET:
- error = proc_net_compat_init();
- if (error) {
- ovs_fatal(error, "failed to initialize /proc/net "
- "compatibility");
- }
- break;
-
VLOG_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
LEAK_CHECKER_OPTION_HANDLERS
VLOG_OPTION_HANDLERS
DAEMON_OPTION_HANDLERS
LEAK_CHECKER_OPTION_HANDLERS
@@
-211,8
+198,8
@@
parse_options(int argc, char *argv[])
argv += optind;
if (argc != 1) {
argv += optind;
if (argc != 1) {
-
ovs_fatal(0,
"database socket is only non-option argument; "
- "use --help for usage");
+
VLOG_FATAL(
"database socket is only non-option argument; "
+
"use --help for usage");
}
return argv[0];
}
return argv[0];
@@
-228,9
+215,7
@@
usage(void)
stream_usage("DATABASE", true, false, true);
daemon_usage();
vlog_usage();
stream_usage("DATABASE", true, false, true);
daemon_usage();
vlog_usage();
- printf("\nLegacy compatibility options:\n"
- " --fake-proc-net simulate some files in /proc/net\n"
- "\nOther options:\n"
+ printf("\nOther options:\n"
" -h, --help display this help message\n"
" -V, --version display version information\n");
leak_checker_usage();
" -h, --help display this help message\n"
" -V, --version display version information\n");
leak_checker_usage();