[master] 2986c1f Ok, not quite _that_ early, we need to have access to SHM.

Poul-Henning Kamp phk at FreeBSD.org
Sun Mar 5 01:12:05 CET 2017


commit 2986c1f0f2e36ebcb6f666211ee013631e84ed23
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Mar 5 00:11:13 2017 +0000

    Ok, not quite _that_ early, we need to have access to SHM.

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index fa69dcd..edc89df 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -758,11 +758,6 @@ main(int argc, char * const *argv)
 		VJ_master(JAIL_MASTER_LOW);
 	}
 
-	if (M_arg != NULL)
-		mgt_cli_master(M_arg);
-	if (T_arg != NULL)
-		mgt_cli_telnet(T_arg);
-
 	if (VIN_N_Arg(n_arg, &heritage.name, &dirname, NULL) != 0)
 		ARGV_ERR("Invalid instance (-n) name: %s\n", strerror(errno));
 
@@ -833,6 +828,11 @@ main(int argc, char * const *argv)
 
 	mgt_SHM_Init();
 
+	if (M_arg != NULL)
+		mgt_cli_master(M_arg);
+	if (T_arg != NULL)
+		mgt_cli_telnet(T_arg);
+
 	AZ(VSB_finish(vident));
 
 	if (S_arg == NULL)



More information about the varnish-commit mailing list