Rename -D to -z

README.md

@@ -30,9 +30,9 @@ Alternatively you may use the -C switch instead:
 
     ./tuntox -C /path/to/the/config/directory/
 
-To daemonize on startup, add -D:
+To daemonize on startup, add -z:
 
-    /path/to/tuntox -D
+    /path/to/tuntox -z
 
 Or, if you run something like supervisord or systemd, you're welcome to contribute a configuration file for the system of your choice (see #3, #4, #6). There's absolutely no need to run the server as root.
 

gitversion.h

@@ -1 +1 @@
-#define GITVERSION "0cc717d070a3ea74562cbcea01165c38d2e9bb87"
+#define GITVERSION "d20725aee450754cc86e8fa1410bbb591561eeda"

main.c

@@ -1164,7 +1164,7 @@ static void child_handler(int signum)
 }
 
 /* 
- * Daemonize the process if -D is set
+ * Daemonize the process if -z is set
  * Optionally drop privileges and create a lock file
  */
 void do_daemonize()
@@ -1398,7 +1398,7 @@ void help()
     fprintf(stdout, "    -d          - debug mode (use twice to display toxcore log too)\n");
     fprintf(stdout, "    -q          - quiet mode\n");
     fprintf(stdout, "    -S          - send output to syslog instead of stdout\n");
-    fprintf(stdout, "    -D          - daemonize (fork) and exit (implies -S)\n");
+    fprintf(stdout, "    -z          - daemonize (fork) and exit (implies -S)\n");
     fprintf(stdout, "    -F <path>   - create a PID file named <path>\n");
     fprintf(stdout, "    -U <username|userid> - drop privileges to <username> before forking. Use\n");
     fprintf(stdout, "                           numeric <userid> in static builds.\n");
@@ -1431,7 +1431,7 @@ int main(int argc, char *argv[])
 
     log_init();
 
-    while ((oc = getopt(argc, argv, "L:pi:I:C:s:f:W:dqhSF:DU:t:u:b:V")) != -1)
+    while ((oc = getopt(argc, argv, "L:pi:I:C:s:f:W:dqhSF:DzU:t:u:b:V")) != -1)
     {
         switch(oc)
         {
@@ -1553,7 +1553,7 @@ int main(int argc, char *argv[])
             case 'S':
                 use_syslog = 1;
                 break;
-            case 'D':
+            case 'z':
                 daemonize = 1;
                 use_syslog = 1;
                 break;

scripts/tuntox.debian-init

@@ -28,7 +28,7 @@ NAME=tuntox
 DAEMON=/usr/bin/$NAME
 DAEMON_CFG_DIR=/etc/tuntox/
 PIDFILE=/var/run/$NAME/$NAME.pid
-DAEMON_ARGS="-C $DAEMON_CFG_DIR -D -F $PIDFILE -U $USERID -d"
+DAEMON_ARGS="-C $DAEMON_CFG_DIR -z -F $PIDFILE -U $USERID -d"
 SCRIPTNAME=/etc/init.d/$NAME
 
 # Exit if packages not installed