[pkg-fso-commits] [nodm] 36/50: debian/nodm.init: Make NODM_OPTIONS configurable via /etc/default/nodm. (Closes: #766124).

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository nodm.

commit 1f960fd6abbef6bca567395f80ee07678c6f30cc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Mar 23 15:50:44 2016 +0100

    debian/nodm.init: Make NODM_OPTIONS configurable via /etc/default/nodm. (Closes: #766124).
---
 debian/changelog     | 1 +
 debian/nodm.init     | 3 ++-
 debian/nodm.postinst | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 695d248..5d5aa02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,7 @@ nodm (0.12-1) UNRELEASED; urgency=low
     + README is now README.md.
   * debian/nodm.init:
     + Provide LSB description header.
+    + Make NODM_OPTIONS configurable via /etc/default/nodm. (Closes: #766124).
   * debian/rules:
     + Correctly evoke ./autogen.sh script at build time.
     + Harden the build of nodm using dpkg's buildflags.mk include.
diff --git a/debian/nodm.init b/debian/nodm.init
index e18af2f..48cc28a 100644
--- a/debian/nodm.init
+++ b/debian/nodm.init
@@ -23,6 +23,7 @@ NODM_ENABLED=no
 NODM_XINIT=/usr/bin/xinit
 NODM_FIRST_VT=7
 NODM_XSESSION=/etc/X11/Xsession
+NODM_OPTIONS=
 NODM_X_OPTIONS="-nolisten tcp"
 NODM_USER=root
 NODM_MIN_SESSION_TIME=60
@@ -56,7 +57,7 @@ case "$1" in
 		then
 			log_warning_msg "Not starting $NAME because NODM_ENABLED is '$NODM_ENABLED' in /etc/default/$NAME"
 		else
-			start-stop-daemon --start --quiet --oknodo --pidfile ${PIDFILE} --make-pidfile --background --exec /usr/sbin/nodm
+			start-stop-daemon --start --quiet --oknodo --pidfile ${PIDFILE} --make-pidfile --background --exec /usr/sbin/nodm -- ${NODM_OPTIONS}
 		fi
 		[ "$VERBOSE" != no ] && log_end_msg $?
 		;;
diff --git a/debian/nodm.postinst b/debian/nodm.postinst
index 480758e..95243bf 100644
--- a/debian/nodm.postinst
+++ b/debian/nodm.postinst
@@ -67,6 +67,9 @@ NODM_FIRST_VT=$NODM_FIRST_VT
 # X session
 NODM_XSESSION=$NODM_XSESSION
 
+# Options for nodm itself
+NODM_OPTIONS=
+
 # Options for the X server
 NODM_X_OPTIONS='$NODM_X_OPTIONS'
 

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-fso/nodm.git