Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
From 53d7d654026afa163a55b860e33c6901129e8dc1 Mon Sep 17 00:00:00 2001
|
||||
From 168d5840dc2a541ec16385e666c1932cf02907e9 Mon Sep 17 00:00:00 2001
|
||||
From: Johan Oudinet <johan.oudinet@gmail.com>
|
||||
Date: Wed, 20 Jan 2016 09:35:07 -0500
|
||||
Date: Wed, 10 Jan 2018 15:00:07 +0100
|
||||
Subject: [PATCH] fix ejabberdctl
|
||||
|
||||
Change default values so ejabberdctl run commands as ejabberd user
|
||||
Change default values so ejabberdctl run commands as ejabberd user.
|
||||
Also add a way for the user to change default values.
|
||||
|
||||
Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
|
||||
@@ -12,23 +12,21 @@ Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ejabberdctl.template b/ejabberdctl.template
|
||||
index f65c21f..ff9225f 100755
|
||||
index 83637766..5a8a8795 100755
|
||||
--- a/ejabberdctl.template
|
||||
+++ b/ejabberdctl.template
|
||||
@@ -14,9 +14,12 @@ SCRIPT_DIR=`cd ${0%/*} && pwd`
|
||||
ERL={{erl}}
|
||||
IEX={{bindir}}/iex
|
||||
EPMD={{bindir}}/epmd
|
||||
-INSTALLUSER={{installuser}}
|
||||
@@ -15,7 +15,10 @@ SCRIPT_DIR=$(cd "${0%/*}" && pwd)
|
||||
ERL="{{erl}}"
|
||||
IEX="{{bindir}}/iex"
|
||||
EPMD="{{epmd}}"
|
||||
-INSTALLUSER="{{installuser}}"
|
||||
+INSTALLUSER=ejabberd
|
||||
ERL_LIBS={{libdir}}
|
||||
|
||||
+
|
||||
+# Read default configuration file if present
|
||||
+[ ! -r /etc/default/ejabberd ] || . /etc/default/ejabberd
|
||||
+
|
||||
# check the proper system user is used if defined
|
||||
if [ "$INSTALLUSER" != "" ] ; then
|
||||
EXEC_CMD="false"
|
||||
|
||||
# check the proper system user is used
|
||||
case $(id -un) in
|
||||
--
|
||||
2.5.0
|
||||
2.14.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user