games-server/minecraft-server/files: restore files

Closes: https://bugs.gentoo.org/831722
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>

2 files changed, 1 insertions, 7 deletions

diff --git a/games-server/minecraft-server/files/minecraft-server.initd-r6 b/games-server/minecraft-server/files/minecraft-server.initd-r5
index dc4ecc84a997..bfaad750b8c7 100644
--- a/games-server/minecraft-server/files/minecraft-server.initd-r6
+++ b/games-server/minecraft-server/files/minecraft-server.initd-r5
@@ -10,7 +10,6 @@ fi
 
 dtach_tmpfile="$(mktemp -u)"
 minecraft_command="/usr/bin/minecraft-server"
-minecraft_log4j="log4j2_112-116.xml"
 minecraft_logs="/var/log/minecraft-server"
 minecraft_logs_instance="${minecraft_logs}/${instance}"
 minecraft_path="/var/lib/minecraft-server"
@@ -24,7 +23,7 @@ extra_started_commands="attach"
 
 command="/usr/bin/dtach"
 command_background="true"
-command_args="-N ${dtach_tmpfile} ${minecraft_command}"
+command_args="-N ${dtach_tmpfile} ${minecraft_command} ${MINECRAFT_OPTS}"
 command_group="minecraft"
 command_user="minecraft"
 
@@ -35,10 +34,6 @@ depend() {
 start_pre() {
 	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_path}" "${minecraft_path_instance}"
 
-	if [ ! -L "${minecraft_path_instance}/${minecraft_log4j}" ]; then
-		ln -s ../../../../usr/share/minecraft-server/"${minecraft_log4j}" "${minecraft_path_instance}"
-	fi
-
 	checkpath -f -o "${command_user}:${command_group}" -q "${minecraft_path_instance}"/eula.txt
 	echo "eula=true" > "${minecraft_path_instance}"/eula.txt
 
diff --git a/games-server/minecraft-server/files/minecraft-server.service-r1 b/games-server/minecraft-server/files/minecraft-server.service
index fac26368a043..ad9167e5b1c9 100644
--- a/games-server/minecraft-server/files/minecraft-server.service-r1
+++ b/games-server/minecraft-server/files/minecraft-server.service
@@ -9,7 +9,6 @@ WorkingDirectory=-/var/lib/minecraft-server/%I
 PIDFile=/run/minecraft-server.%I.pid
 ExecStartPre=!/bin/mkdir -p /var/lib/minecraft-server/%I
 ExecStartPre=!/bin/chown -R minecraft:minecraft /var/lib/minecraft-server/%I
-ExecStartPre=!/bin/ln -s /usr/share/minecraft-server/log4j2_112-116.xml /var/lib/minecraft-server/%I
 ExecStartPre=/bin/sh -c 'echo "eula=true" > /var/lib/minecraft-server/%I/eula.txt'
 ExecStart=/bin/sh -c '/usr/bin/dtach -N $(mktemp -u) /usr/bin/minecraft-server'