-/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
set_program_name(argv[0]);
retval = dpdk_init(argc,argv);
+ if (retval < 0) {
+ return retval;
+ }
+
argc -= retval;
argv += retval;
fatal_ignore_sigpipe();
ovsrec_init();
- daemonize_start();
+ daemonize_start(true);
if (want_mlockall) {
#ifdef HAVE_MLOCKALL
break;
case OPT_ENABLE_DUMMY:
- dummy_enable(optarg && !strcmp(optarg, "override"));
+ dummy_enable(optarg);
break;
case OPT_DISABLE_SYSTEM:
daemon_usage();
vlog_usage();
printf("\nDPDK options:\n"
- " --dpdk options Initialize DPDK datapath.\n"
- " --cuse_dev_name BASENAME override default character device name\n"
- " for use with userspace vHost.\n");
+ " --dpdk [VHOST] [DPDK] Initialize DPDK datapath.\n"
+ " where DPDK are options for initializing DPDK lib and VHOST is\n"
+#ifdef VHOST_CUSE
+ " option to override default character device name used for\n"
+ " for use with userspace vHost\n"
+ " -cuse_dev_name NAME\n"
+#else
+ " option to override default directory where vhost-user\n"
+ " sockets are created.\n"
+ " -vhost_sock_dir DIR\n"
+#endif
+ );
printf("\nOther options:\n"
" --unixctl=SOCKET override default control socket name\n"
" -h, --help display this help message\n"