X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fovs-vswitchd.c;h=b9a24618404c6cd753f7b7bdf1034d8a8ea24ff9;hb=76ea8efd442a403f8e874cd4103dafe2479b6a57;hp=cd30c96d309762f96b4afb9c90bff079316181a7;hpb=ee45ad81ab7e9ff6034352b6743985e28fedd649;p=openvswitch

diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c
index cd30c96d..b9a24618 100644
--- a/vswitchd/ovs-vswitchd.c
+++ b/vswitchd/ovs-vswitchd.c
@@ -1,4 +1,4 @@
-/* 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.
@@ -36,7 +36,6 @@
 #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"
@@ -75,7 +74,6 @@ main(int argc, char *argv[])
     process_init();
     ovsrec_init();
 
-    die_if_already_running();
     daemonize_start();
 
     retval = unixctl_server_create(NULL, &unixctl);
@@ -84,8 +82,6 @@ main(int argc, char *argv[])
     }
     unixctl_command_register("exit", ovs_vswitchd_exit, &exiting);
 
-    daemonize_complete();
-
     bridge_init(remote);
     exiting = false;
     while (!exiting) {
@@ -119,17 +115,16 @@ parse_options(int argc, char *argv[])
     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,
-        OPT_ENABLE_DUMMY
+        OPT_ENABLE_DUMMY,
+        DAEMON_OPTION_ENUMS
     };
     static struct option long_options[] = {
         {"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,
@@ -142,7 +137,6 @@ parse_options(int argc, char *argv[])
         {0, 0, 0, 0},
     };
     char *short_options = long_options_to_short_options(long_options);
-    int error;
 
     for (;;) {
         int c;
@@ -171,14 +165,6 @@ parse_options(int argc, char *argv[])
 #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
@@ -212,8 +198,8 @@ parse_options(int argc, char *argv[])
     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];
@@ -229,9 +215,7 @@ usage(void)
     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();