From 1e1b72572fc16c174a8727207a06b9d06eba2648 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Wed, 9 Mar 2022 15:21:46 +0100
Subject: [PATCH] Add -boot and -boot_var in ejabberdctl instead of adding
 vm.args

---
 mix.exs         |  3 +--
 rel/vm.args.mix | 14 --------------
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 rel/vm.args.mix

diff --git a/mix.exs b/mix.exs
index 79bfb7a39..22364b751 100644
--- a/mix.exs
+++ b/mix.exs
@@ -241,7 +241,7 @@ defmodule Ejabberd.MixProject do
     Mix.Generator.copy_template("ejabberdctl.example2a", "ejabberdctl.example2b", assigns)
     execute.("sed -e 's|{{\\(\[_a-z\]*\\)}}|<%= @\\1 %>|g' ejabberdctl.example2b > ejabberdctl.example3")
     execute.("sed -e 's|ERLANG_NODE=ejabberd@localhost|ERLANG_NODE=ejabberd|g' ejabberdctl.example3 > ejabberdctl.example4")
-    execute.("sed -e 's|INSTALLUSER=|ERL_OPTIONS=\"-setcookie \\$\\(cat \"\\${SCRIPT_DIR%/*}/releases/COOKIE\")\"\\nINSTALLUSER=|g' ejabberdctl.example4 > ejabberdctl.example5")
+    execute.("sed -e 's|INSTALLUSER=|ERL_OPTIONS=\"-boot ../releases/#{release.version}/start_clean -boot_var RELEASE_LIB ../lib -setcookie \\$\\(cat \"\\${SCRIPT_DIR%/*}/releases/COOKIE\")\"\\nINSTALLUSER=|g' ejabberdctl.example4 > ejabberdctl.example5")
     Mix.Generator.copy_template("ejabberdctl.example5", "#{ro}/bin/ejabberdctl", assigns)
     File.chmod("#{ro}/bin/ejabberdctl", 0o755)
 
@@ -264,7 +264,6 @@ defmodule Ejabberd.MixProject do
     Mix.Generator.copy_file("ejabberd.yml.example", "#{ro}/etc/ejabberd/ejabberd.yml#{suffix}")
     Mix.Generator.copy_file("ejabberdctl.cfg.example", "#{ro}/etc/ejabberd/ejabberdctl.cfg#{suffix}")
     Mix.Generator.copy_file("inetrc", "#{ro}/etc/ejabberd/inetrc")
-    Mix.Generator.copy_template("rel/vm.args.mix", "#{ro}/etc/ejabberd/vm.args", assigns)
 
     Enum.each(File.ls!("sql"),
       fn x ->
diff --git a/rel/vm.args.mix b/rel/vm.args.mix
deleted file mode 100644
index 711bd3189..000000000
--- a/rel/vm.args.mix
+++ /dev/null
@@ -1,14 +0,0 @@
-## Customize flags given to the VM: https://erlang.org/doc/man/erl.html
-## -mode/-name/-sname/-setcookie are configured via env vars, do not set them here
-
--boot ../releases/<%= @version %>/start_clean
--boot_var RELEASE_LIB ../lib
-
-## Number of dirty schedulers doing IO work (file, sockets, and others)
-##+SDio 5
-
-## Increase number of concurrent ports/sockets
-##+Q 65536
-
-## Tweak GC to run more often
-##-env ERL_FULLSWEEP_AFTER 10