| 1 |
prometheanfire 13/10/29 06:55:05 |
| 2 |
|
| 3 |
Modified: noVNC.initd |
| 4 |
Log: |
| 5 |
many changes from bug 486568, thanks alonbl |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 www-apps/novnc/files/noVNC.initd |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/novnc/files/noVNC.initd?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/novnc/files/noVNC.initd?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/novnc/files/noVNC.initd?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: noVNC.initd |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-apps/novnc/files/noVNC.initd,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- noVNC.initd 27 Sep 2013 01:39:57 -0000 1.1 |
| 23 |
+++ noVNC.initd 29 Oct 2013 06:55:05 -0000 1.2 |
| 24 |
@@ -1,10 +1,17 @@ |
| 25 |
#!/sbin/runscript |
| 26 |
# Copyright 1999-2013 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/www-apps/novnc/files/noVNC.initd,v 1.1 2013/09/27 01:39:57 prometheanfire Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/www-apps/novnc/files/noVNC.initd,v 1.2 2013/10/29 06:55:05 prometheanfire Exp $ |
| 30 |
# |
| 31 |
# Author: Cor Cornelisse <corcornelisse@×××××.com> |
| 32 |
|
| 33 |
+pidfile="/var/run/${SVCNAME}.pid" |
| 34 |
+command="/usr/bin/nova-novncproxy" |
| 35 |
+command_args="--flagfile=${FLAG_FILE} --cert=${CERT_FILE} --web ${WEB_ROOT}" |
| 36 |
+command_background="yes" |
| 37 |
+start_stop_daemon_args="--stdout ${LOG_PATH}/${SVCNAME}.log --stderr ${LOG_PATH}/${SVCNAME}.err" |
| 38 |
+ |
| 39 |
+ |
| 40 |
depend() { |
| 41 |
need net |
| 42 |
} |
| 43 |
@@ -18,32 +25,6 @@ |
| 44 |
} |
| 45 |
|
| 46 |
|
| 47 |
-start() { |
| 48 |
- checkconfig || return $? |
| 49 |
- . /etc/conf.d/${SVCNAME} |
| 50 |
- |
| 51 |
- ebegin "Starting ${SVCNAME}" |
| 52 |
- |
| 53 |
- start-stop-daemon --start --quiet --make-pidfile --pidfile \ |
| 54 |
- "/var/run/${SVCNAME}.pid" --background \ |
| 55 |
- --stdout ${LOG_PATH}/${SVCNAME}.log \ |
| 56 |
- --stderr ${LOG_PATH}/${SVCNAME}.err --exec \ |
| 57 |
- /opt/noVNC/utils/nova-novncproxy -- \ |
| 58 |
- --flagfile=${FLAG_FILE} --cert=${CERT_FILE} \ |
| 59 |
- --web ${WEB_ROOT} |
| 60 |
- |
| 61 |
- |
| 62 |
- eend $? "Failed to start ${SVCNAME}" |
| 63 |
-} |
| 64 |
- |
| 65 |
-stop() { |
| 66 |
+start_pre() { |
| 67 |
checkconfig || return $? |
| 68 |
- . /etc/conf.d/${SVCNAME} |
| 69 |
- |
| 70 |
- ebegin "Stopping ${SVCNAME}" |
| 71 |
- |
| 72 |
- start-stop-daemon --stop --pidfile "/var/run/${SVCNAME}.pid" \ |
| 73 |
- --exec /opt/noVNC/utils/nova-novncproxy |
| 74 |
- eend $? "Failed to stop ${SVCNAME}" |
| 75 |
} |
| 76 |
- |
Archives