X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Ftemplate%2Finspircd;h=c14099323ea81487c06ab622f5a2b201f9212c3d;hb=1031f333332cf1b09db4fd632f141143ee637c34;hp=a75140c5dbcd8fccaa20c07501e763143b30ba8a;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/template/inspircd b/make/template/inspircd
index a75140c5d..c14099323 100644
--- a/make/template/inspircd
+++ b/make/template/inspircd
@@ -27,12 +27,13 @@ my $basepath	=	"@BASE_DIR@";
 my $confpath	=	"@CONFIG_DIR@/";
 my $binpath	=	"@BINARY_DIR@";
 my $runpath	=	"@BASE_DIR@";
+my $datadir	=       "@DATA_DIR@";
 my $valgrindlogpath	=	"$basepath/valgrindlogs";
-my $executable	=	"@EXECUTABLE@";
+my $executable	=	"inspircd";
 my $version	=	"@VERSION@";
 my $uid = "@UID@";
 
-if ($< == 0 || $> == 0) {
+if (!("--runasroot" ~~ @ARGV) && ($< == 0 || $> == 0)) {
 	if ($uid !~ /^\d+$/) {
 		# Named UID, look it up
 		$uid = getpwnam $uid;
@@ -382,7 +383,7 @@ sub getpidfile
 	}
 
 	# End of includes / No includes found. Using default.
-	$pidfile = $runpath . "/data/inspircd.pid";
+	$pidfile = $datadir . "/inspircd.pid";
 }
 
 sub getstatus {