diff options
| author | cocoon <nemea@gmx.net> | 2013-07-05 21:58:16 +0200 |
|---|---|---|
| committer | cocoon <nemea@gmx.net> | 2013-07-05 21:58:16 +0200 |
| commit | 781e992c9e77ec90319b5b71799fb45c3d400dec (patch) | |
| tree | fa230d29593fe172527b3d8adbb884c9b7ed704d /instfiles | |
| parent | ec7d1b4c384e4c8ee726a56920dfbf05b239518d (diff) | |
| download | xrdp-proprietary-781e992c9e77ec90319b5b71799fb45c3d400dec.tar.gz xrdp-proprietary-781e992c9e77ec90319b5b71799fb45c3d400dec.zip | |
xrdp initscript add BASE var, add SDAEMON var, replace fullpaths
with combined path var
-DAEMON=/usr/sbin/xrdp
+BASE=__BASE__
(PREFIX gets replaced by given prefix, or as fallback /usr/local on Ubuntu)
+DAEMON=${BASE}/sbin/xrdp
+SDAEMON=${BASE}/sbin/xrdp-sesman
Diffstat (limited to 'instfiles')
| -rw-r--r-- | instfiles/init.d/xrdp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/instfiles/init.d/xrdp b/instfiles/init.d/xrdp index 2cf20999..dcdb01a4 100644 --- a/instfiles/init.d/xrdp +++ b/instfiles/init.d/xrdp @@ -15,7 +15,9 @@ ### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/xrdp +BASE=__BASE__ +DAEMON=${BASE}/sbin/xrdp +SDAEMON=${BASE}/sbin/xrdp-sesman PIDDIR=/var/run/xrdp/ SESMAN_START=yes #USERID=xrdp @@ -97,7 +99,7 @@ case "$1" in if [ "$SESMAN_START" = "yes" ] ; then log_progress_msg "sesman" start-stop-daemon --start --quiet --oknodo --pidfile $PIDDIR/xrdp-sesman.pid \ - --exec /usr/sbin/xrdp-sesman >/dev/null + --exec $SDAEMON >/dev/null value=$? [ $value -gt 0 ] && exitval=$value fi @@ -117,9 +119,9 @@ case "$1" in exitval=0 log_daemon_msg "Stopping RDP Session manager " log_progress_msg "sesman" - if pidofproc -p $PIDDIR/xrdp-sesman.pid /usr/sbin/xrdp-sesman > /dev/null; then + if pidofproc -p $PIDDIR/xrdp-sesman.pid $SDAEMON > /dev/null; then start-stop-daemon --stop --quiet --oknodo --pidfile $PIDDIR/xrdp-sesman.pid \ - --chuid $USERID:$USERID --exec /usr/sbin/xrdp-sesman + --chuid $USERID:$USERID --exec $SDAEMON exitval=$? else log_progress_msg "apparently not running" @@ -164,7 +166,7 @@ case "$1" in fi if [ "$SESMAN_START" = "yes" ] ; then log_daemon_msg "Checking status of RDP Session Manager" "sesman" - if pidofproc -p $PIDDIR/xrdp-sesman.pid /usr/sbin/xrdp-sesman > /dev/null; then + if pidofproc -p $PIDDIR/xrdp-sesman.pid $SDAEMON > /dev/null; then log_progress_msg "running" log_end_msg 0 else |