[pkg-fso-commits] [nodm] 46/50: debian/<debconf>: Explain about how the NODM_X_OPTIONS env var has to be populated.

[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 31a6819c03ae30f781b67e17110ec3b97e81529d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 24 18:44:15 2016 +0100

    debian/<debconf>: Explain about how the NODM_X_OPTIONS env var has to be populated.
---
 debian/changelog      | 2 ++
 debian/nodm.postinst  | 7 ++++++-
 debian/nodm.templates | 5 +++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index af7592a..1851483 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ nodm (0.12-2) UNRELEASED; urgency=medium
   * debian/changelog:
     + Add post-upload closure for #638601. Bug has been closed manually
       meanwhile (on Thu 24th Mar 2016).
+  * debian/<debconf>:
+    + Explain about how the NODM_X_OPTIONS env var has to be populated.
 
  -- Mike Gabriel <sunweaver at debian.org>  Thu, 24 Mar 2016 14:43:36 +0100
 
diff --git a/debian/nodm.postinst b/debian/nodm.postinst
index 95243bf..b209bce 100644
--- a/debian/nodm.postinst
+++ b/debian/nodm.postinst
@@ -70,7 +70,12 @@ NODM_XSESSION=$NODM_XSESSION
 # Options for nodm itself
 NODM_OPTIONS=
 
-# Options for the X server
+# Options for the X server.
+#
+# Format: [/usr/bin/<Xserver>] [:<disp>] <Xserver-options>
+#
+# The Xserver executable and the display name can be omitted, but should
+# be placed in front, if nodm's defaults shall be overridden.
 NODM_X_OPTIONS='$NODM_X_OPTIONS'
 
 # If an X session will run for less than this time in seconds, nodm will wait an
diff --git a/debian/nodm.templates b/debian/nodm.templates
index b8f9fc8..5d1223a 100644
--- a/debian/nodm.templates
+++ b/debian/nodm.templates
@@ -43,6 +43,11 @@ Default: -nolisten tcp
 _Description: Options for the X server:
  Please enter the options to pass to the X server when starting it.
  .
+ Format: [/usr/bin/<Xserver>] [:<disp>] <Xserver-options>
+ .
+ The Xserver executable and the display name can be omitted, but should
+ be placed in front, if nodm's defaults shall be overridden.
+ .
  If no vtN option is used, nodm will perform automatic vt allocation.
 
 Template: nodm/min_session_time

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