diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2013-07-08 13:05:51 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2013-07-08 13:05:51 -0700 |
| commit | d2915f349a6b885cafbc549cea29ab6a541626ed (patch) | |
| tree | 30bd350aa211859b148d8393902cf1f74beb1f26 | |
| parent | 110edd31c81f7e41365aecd82ce96f2b9a0fcf77 (diff) | |
| parent | 12381b1c0d7cc6a497a12b32c2d7e9be19ddb309 (diff) | |
| download | xrdp-proprietary-d2915f349a6b885cafbc549cea29ab6a541626ed.tar.gz xrdp-proprietary-d2915f349a6b885cafbc549cea29ab6a541626ed.zip | |
Merge remote-tracking branch 'xrdp-org/master'
| -rw-r--r-- | instfiles/Makefile.am | 1 | ||||
| -rw-r--r-- | instfiles/init.d/xrdp | 12 |
2 files changed, 8 insertions, 5 deletions
diff --git a/instfiles/Makefile.am b/instfiles/Makefile.am index 7ba86d3d..1a73fd24 100644 --- a/instfiles/Makefile.am +++ b/instfiles/Makefile.am @@ -29,3 +29,4 @@ startscript_DATA = \ install-data-hook: chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/xrdp.sh chmod 755 $(DESTDIR)$(sysconfdir)/init.d/xrdp + sed -i 's|__BASE__|$(prefix)|' $(sysconfdir)/init.d/xrdp; 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 |