From 42f3d4dc79d6bf1b23f675f35b6517b163fa8818 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Mon, 22 Jun 2015 11:55:47 +0200
Subject: [PATCH] Refactor: Move DEFUSER and DEFHOST to configure script

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
---
 configure | 19 +++++++++++++++++--
 finit.h   |  7 -------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index 4e6510d6..4293626f 100755
--- a/configure
+++ b/configure
@@ -26,6 +26,8 @@ defaults()
 	config=${config:="$sysconfdir/$conf"}
 	confdir=${confdir:="finit.d"}
 	rcsd=${rcsd:="$sysconfdir/$confdir"}
+        defuser=${defuser:="root"}
+        defhost=${defhost:="noname"}
 	debug=${debug:=0}
 	embedded=${embedded:=0}
 	inetd=${inetd:=1}
@@ -51,6 +53,9 @@ fi
 	echo "FIFO              : $fifo"
 	echo "Config file       : $config"
 	echo "rcs.d/ directory  : $rcsd"
+        echo "Default username  : $defuser"
+        echo "Default hostname  : $defhost"
+
 	if [ $debug -ne 0 ]; then
 		echo "Debug             : ENABLED"
 	fi
@@ -108,6 +113,8 @@ usage()
         echo "                         files, or as built-in if --enable-static is given,"
 	echo "                         defaults to all plugins.  Exclude extension!"
 	echo "  --with-rcsd=RCSD       Finit RCSD directory, default '\$sysconfdir/$confdir'"
+	echo "  --with-username=USER   User for 'startx' .conf option, default: root"
+	echo "  --with-hostname=NAME   Hostname, if /etc/hostname is missing, default: noname"
         echo
 	echo "  --enable-embedded      Enable embedded defaults, BusBox getty, mdev etc."
 	echo "  --enable-debug         Enable debug flags, '-O0, -g'"
@@ -178,6 +185,14 @@ while [ "$*" != "" ]; do
                         rcsd="$arg"
                         ;;
 
+                with-usename)
+                        defuser="$arg"
+                        ;;
+
+                with-hostname)
+                        defhost="$arg"
+                        ;;
+
                 enable-debug)
 			debug=1
                         ;;
@@ -292,5 +307,5 @@ echo "#define FINIT_FIFO      \"$fifo\""            >> config.h
 echo "#define FINIT_CONF      \"$config\""          >> config.h
 echo "#define FINIT_RCSD      \"$rcsd\""            >> config.h
 echo "#define PLUGIN_PATH     \"$plugindir\""       >> config.h
-
-
+echo "#define DEFUSER         \"$defuser\""         >> config.h
+echo "#define DEFHOST         \"$defhost\""         >> config.h
diff --git a/finit.h b/finit.h
index a3c5cfef..2486a3ee 100644
--- a/finit.h
+++ b/finit.h
@@ -62,13 +62,6 @@
 # define FALLBACK_SHELL		_PATH_BSHELL
 #endif
 
-#ifndef DEFUSER
-# define DEFUSER		"root"
-#endif
-#ifndef DEFHOST
-# define DEFHOST		"noname"
-#endif
-
 #define CMD_SIZE                256
 #define LINE_SIZE               1024
 #define BUF_SIZE                4096