[game-data-packager] 228/293: Modify quake*-server configuration

Simon McVittie smcv at debian.org
Fri Oct 14 00:12:19 UTC 2016 

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch quake
in repository game-data-packager.

commit ad77dd783701b51894a495acd52aa858c139e1b9
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jan 26 10:44:35 2015 +0000

    Modify quake*-server configuration
    
      - put default for DAEMON_OPTS in /etc/init.d/quake*-server so it can
        operate without /etc/default/quake*-server
      - "+exec etc/quake*-server/server.cfg" is no longer part of DAEMON_OPTS
---
 debian/changelog             | 7 ++++---
 debian/quake-server.default  | 7 +++++--
 debian/quake-server.init     | 5 ++++-
 debian/quake2-server.default | 8 ++++++--
 debian/quake2-server.init    | 4 +++-
 debian/quake3-server.default | 7 +++++--
 debian/quake3-server.init    | 6 ++++--
 7 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0e19f6..f8a0460 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,10 @@ quake (10) UNRELEASED; urgency=medium
   * quake, quake3: remove support for START_DAEMON
     - if the server was previously disabled via START_DAEMON,
       do a one-time migration to "update-rc.d $SERVICE disable"
-  * quake3: modify quake3-server configuration
-    - put default for DAEMON_OPTS in /etc/init.d/quake3-server so it can
-      operate without /e/d/q3-s
+  * Modify quake*-server configuration
+    - put default for DAEMON_OPTS in /etc/init.d/quake*-server so it can
+      operate without /etc/default/quake*-server
+    - "+exec etc/quake*-server/server.cfg" is no longer part of DAEMON_OPTS
   * quake3: prefer to load game data from /usr/lib/quake3/base
     or /usr/lib/quake3/ta, where ioquake3 can provide native-code game modules
     - this requires ioquake3 (>= 1.36+u20150114+dfsg1-1~) and
diff --git a/debian/quake-server.default b/debian/quake-server.default
index 5b5b7b7..826ea66 100644
--- a/debian/quake-server.default
+++ b/debian/quake-server.default
@@ -2,9 +2,12 @@
 # sourced by /etc/init.d/quake-server
 # installed at /etc/default/quake-server by the maintainer scripts
 
-# Additional options that are passed to the daemon.
+# Options that are passed to the daemon.
+#
+# In addition to these options, the server will execute commands from
+# /etc/quake-server/server.cfg using "+exec etc/quake-server/server.cfg".
 # For most options it's better to edit server.cfg instead.
-DAEMON_OPTS="+exec etc/quake-server/server.cfg"
+DAEMON_OPTS=""
 
 # To disable the server, please use the normal mechanisms provided by init:
 # "update-rc.d quake-server disable". The START_DAEMON variable is no
diff --git a/debian/quake-server.init b/debian/quake-server.init
index 42c4511..17b99a1 100644
--- a/debian/quake-server.init
+++ b/debian/quake-server.init
@@ -16,6 +16,7 @@ DESC="Quake dedicated server"
 PIDFILE="/var/run/$NAME.pid"
 BINARY="/usr/lib/quake/quake-engine-server"
 USER="$NAME"
+DAEMON_OPTS=""
 
 test -x $DAEMON || exit 0
 
@@ -33,7 +34,9 @@ do_start() {
     start-stop-daemon --start --quiet --pidfile $PIDFILE --oknodo \
 	--background --exec $BINARY --startas $DAEMON \
 	--make-pidfile --chuid $USER \
-	-- $DAEMON_OPTS > /dev/null 2>&1 || return 1
+	-- $DAEMON_OPTS \
+	+exec etc/quake-server/server.cfg \
+	> /dev/null 2>&1 || return 1
     return 0
 }
 
diff --git a/debian/quake2-server.default b/debian/quake2-server.default
index 69849bb..cce4eaf 100644
--- a/debian/quake2-server.default
+++ b/debian/quake2-server.default
@@ -2,6 +2,10 @@
 # sourced by /etc/init.d/quake2-server
 # installed at /etc/default/quake2-server by the maintainer scripts
 
-# Additional options that are passed to the daemon.
+# Options that are passed to the daemon.
+#
+# In addition to these options, the server will execute commands from
+# /etc/quake2-server/debian_server.cfg or
+# /etc/quake2-server/demo/debian_server.cfg using "+exec debian_server.cfg".
 # For most options it's better to edit debian_server.cfg instead.
-DAEMON_OPTS="+exec debian_server.cfg"
+DAEMON_OPTS=""
diff --git a/debian/quake2-server.init b/debian/quake2-server.init
index 7ce83ac..dbcce23 100644
--- a/debian/quake2-server.init
+++ b/debian/quake2-server.init
@@ -16,6 +16,7 @@ DESC="Quake II dedicated server"
 PIDFILE="/var/run/$NAME.pid"
 BINARY="/usr/lib/quake2/quake2-engine-server"
 USER="$NAME"
+DAEMON_OPTS=""
 
 test -x $DAEMON || exit 0
 
@@ -33,7 +34,8 @@ do_start() {
     start-stop-daemon --start --quiet --pidfile $PIDFILE --oknodo \
 	--background --exec $BINARY --startas $DAEMON \
 	--make-pidfile --chuid $USER \
-	-- $DAEMON_OPTS > /dev/null 2>&1 || return 1
+	-- $DAEMON_OPTS +exec debian_server.cfg \
+	> /dev/null 2>&1 || return 1
     return 0
 }
 
diff --git a/debian/quake3-server.default b/debian/quake3-server.default
index 4e477bc..7b37dbc 100644
--- a/debian/quake3-server.default
+++ b/debian/quake3-server.default
@@ -2,9 +2,12 @@
 # sourced by /etc/init.d/quake3-server
 # installed at /etc/default/quake3-server by the maintainer scripts
 
-# Additional options that are passed to the daemon.
+# Options that are passed to the daemon.
+#
+# In addition to these options, the server will execute commands from
+# /etc/quake3-server/server.cfg using "+exec etc/quake3-server/server.cfg".
 # For most options it's better to edit server.cfg instead.
-DAEMON_OPTS="+exec etc/quake3-server/server.cfg"
+DAEMON_OPTS=""
 
 # To disable the server, please use the normal mechanisms provided by init:
 # "update-rc.d quake3-server disable". The START_DAEMON variable is no
diff --git a/debian/quake3-server.init b/debian/quake3-server.init
index 8852e7a..61b5408 100644
--- a/debian/quake3-server.init
+++ b/debian/quake3-server.init
@@ -17,7 +17,7 @@ DESC="Quake III Arena dedicated server"
 PIDFILE="/var/run/$NAME.pid"
 BINARY="/usr/lib/ioquake3/ioq3ded"
 USER="Debian-quake3"
-DAEMON_OPTS="+exec etc/quake3-server/server.cfg"
+DAEMON_OPTS=""
 
 test -x $DAEMON || exit 0
 
@@ -34,7 +34,9 @@ q3_start() {
 	--make-pidfile --chuid $USER \
 	-- \
 	+set com_homepath /var/games/quake3-server/server.q3a \
-	$DAEMON_OPTS > /dev/null 2>&1 || return 1
+	$DAEMON_OPTS \
+	+exec etc/quake3-server/server.cfg \
+	> /dev/null 2>&1 || return 1
     return 0
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git

More information about the Pkg-games-commits mailing list