| 1 |
commit: 9607b827c39b33c230e47eafdd16b9f09dbc2e30 |
| 2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 21 20:54:02 2022 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 21 20:54:02 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9607b827 |
| 7 |
|
| 8 |
games-server/minecraft-server/files: restore files |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/831722 |
| 11 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/{minecraft-server.initd-r6 => minecraft-server.initd-r5} | 7 +------ |
| 14 |
.../{minecraft-server.service-r1 => minecraft-server.service} | 1 - |
| 15 |
2 files changed, 1 insertion(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/games-server/minecraft-server/files/minecraft-server.initd-r6 b/games-server/minecraft-server/files/minecraft-server.initd-r5 |
| 18 |
similarity index 88% |
| 19 |
rename from games-server/minecraft-server/files/minecraft-server.initd-r6 |
| 20 |
rename to games-server/minecraft-server/files/minecraft-server.initd-r5 |
| 21 |
index dc4ecc84a997..bfaad750b8c7 100644 |
| 22 |
--- a/games-server/minecraft-server/files/minecraft-server.initd-r6 |
| 23 |
+++ b/games-server/minecraft-server/files/minecraft-server.initd-r5 |
| 24 |
@@ -10,7 +10,6 @@ fi |
| 25 |
|
| 26 |
dtach_tmpfile="$(mktemp -u)" |
| 27 |
minecraft_command="/usr/bin/minecraft-server" |
| 28 |
-minecraft_log4j="log4j2_112-116.xml" |
| 29 |
minecraft_logs="/var/log/minecraft-server" |
| 30 |
minecraft_logs_instance="${minecraft_logs}/${instance}" |
| 31 |
minecraft_path="/var/lib/minecraft-server" |
| 32 |
@@ -24,7 +23,7 @@ extra_started_commands="attach" |
| 33 |
|
| 34 |
command="/usr/bin/dtach" |
| 35 |
command_background="true" |
| 36 |
-command_args="-N ${dtach_tmpfile} ${minecraft_command}" |
| 37 |
+command_args="-N ${dtach_tmpfile} ${minecraft_command} ${MINECRAFT_OPTS}" |
| 38 |
command_group="minecraft" |
| 39 |
command_user="minecraft" |
| 40 |
|
| 41 |
@@ -35,10 +34,6 @@ depend() { |
| 42 |
start_pre() { |
| 43 |
checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_path}" "${minecraft_path_instance}" |
| 44 |
|
| 45 |
- if [ ! -L "${minecraft_path_instance}/${minecraft_log4j}" ]; then |
| 46 |
- ln -s ../../../../usr/share/minecraft-server/"${minecraft_log4j}" "${minecraft_path_instance}" |
| 47 |
- fi |
| 48 |
- |
| 49 |
checkpath -f -o "${command_user}:${command_group}" -q "${minecraft_path_instance}"/eula.txt |
| 50 |
echo "eula=true" > "${minecraft_path_instance}"/eula.txt |
| 51 |
|
| 52 |
|
| 53 |
diff --git a/games-server/minecraft-server/files/minecraft-server.service-r1 b/games-server/minecraft-server/files/minecraft-server.service |
| 54 |
similarity index 83% |
| 55 |
rename from games-server/minecraft-server/files/minecraft-server.service-r1 |
| 56 |
rename to games-server/minecraft-server/files/minecraft-server.service |
| 57 |
index fac26368a043..ad9167e5b1c9 100644 |
| 58 |
--- a/games-server/minecraft-server/files/minecraft-server.service-r1 |
| 59 |
+++ b/games-server/minecraft-server/files/minecraft-server.service |
| 60 |
@@ -9,7 +9,6 @@ WorkingDirectory=-/var/lib/minecraft-server/%I |
| 61 |
PIDFile=/run/minecraft-server.%I.pid |
| 62 |
ExecStartPre=!/bin/mkdir -p /var/lib/minecraft-server/%I |
| 63 |
ExecStartPre=!/bin/chown -R minecraft:minecraft /var/lib/minecraft-server/%I |
| 64 |
-ExecStartPre=!/bin/ln -s /usr/share/minecraft-server/log4j2_112-116.xml /var/lib/minecraft-server/%I |
| 65 |
ExecStartPre=/bin/sh -c 'echo "eula=true" > /var/lib/minecraft-server/%I/eula.txt' |
| 66 |
ExecStart=/bin/sh -c '/usr/bin/dtach -N $(mktemp -u) /usr/bin/minecraft-server' |
Archives