From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 24 Jul 2018 19:03:07 +0000 (+0100)
Subject: examples/disorder.init.in: Read settings from `/etc/default/disorder'.
X-Git-Tag: 5.2~9
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/141b38656171afde419a3267055b6c05f8b2082b

examples/disorder.init.in: Read settings from `/etc/default/disorder'.

Most usefully, one can tweak locale settings here.
---

diff --git a/examples/disorder.init.in b/examples/disorder.init.in
index 94343d3..5e15044 100644
--- a/examples/disorder.init.in
+++ b/examples/disorder.init.in
@@ -36,6 +36,10 @@ CLIENT="bindir/disorder --local"
 
 PATH="$PATH:sbindir"
 
+if [ -r /etc/default/disorder ]; then
+  . sysconfdir/default/disorder
+fi
+
 start_debian() {
   printf "Starting DisOrder server: disorderd"
   start-stop-daemon -S -q -x ${DAEMON}
diff --git a/scripts/sedfiles.make b/scripts/sedfiles.make
index f0cb633..fcf3bb8 100644
--- a/scripts/sedfiles.make
+++ b/scripts/sedfiles.make
@@ -20,6 +20,7 @@ $(SEDFILES) : % : %.in Makefile
 	rm -f $@.new
 	$(GNUSED) -e 's!sbindir!${sbindir}!g;' \
 	    -e 's!bindir!${bindir}!g;' \
+	    -e 's!sysconfdir!${sysconfdir}!g;' \
 	    -e 's!pkgconfdir!${sysconfdir}/disorder!g;' \
 	    -e 's!pkgstatedir!${localstatedir}/disorder!g;' \
 	    -e 's!pkgdatadir!${pkgdatadir}!g;' \