This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gothinclient. from 227f2aa assure that x2gothinclient-minidesktop enforces removal of x2gothinclient new e450bff Init scripts: Provide status option. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: cdmanager/init/x2gothinclient-cdmanager.init | 5 +++++ chroot/init/x2gothinclient-chroot.init | 2 +- debian/changelog | 1 + .../init/x2gothinclient-displaymanager.init | 7 +++++++ minidesktop/init/x2gothinclient-minidesktop.init | 2 +- 5 files changed, 15 insertions(+), 2 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit e450bff89617e10beefde4ded0c4844a98905af7 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Aug 24 17:30:16 2014 +0200 Init scripts: Provide status option. --- cdmanager/init/x2gothinclient-cdmanager.init | 5 +++++ chroot/init/x2gothinclient-chroot.init | 2 +- debian/changelog | 1 + .../init/x2gothinclient-displaymanager.init | 7 +++++++ minidesktop/init/x2gothinclient-minidesktop.init | 2 +- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/cdmanager/init/x2gothinclient-cdmanager.init b/cdmanager/init/x2gothinclient-cdmanager.init index a6eeabe..d291598 100644 --- a/cdmanager/init/x2gothinclient-cdmanager.init +++ b/cdmanager/init/x2gothinclient-cdmanager.init @@ -61,6 +61,11 @@ case "$1" in start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid || true log_end_msg $? ;; + status) + log_daemon_msg "Status of $DESC" "x2gocdmanager" + start-stop-daemon --oknodo --status --quiet --pidfile /var/run/$NAME.pid || true + log_end_msg $? + ;; force-reload) start-stop-daemon --stop --test --quiet --pidfile /var/run/$NAME.pid && $0 restart || exit 0 ;; diff --git a/chroot/init/x2gothinclient-chroot.init b/chroot/init/x2gothinclient-chroot.init index c88727b..bcd03ee 100644 --- a/chroot/init/x2gothinclient-chroot.init +++ b/chroot/init/x2gothinclient-chroot.init @@ -28,7 +28,7 @@ case "$1" in chown statd:nogroup /var/lib/nfs/sm.bak exit 0 ;; - restart|reload|force-reload) + restart|reload|force-reload|status) echo "Error: argument '$1' not supported" >&2 exit 3 ;; diff --git a/debian/changelog b/debian/changelog index c84e21f..18e0d9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low (x2gothinclient_shell or x2gothinclient_upgrade). - Avoid x2gothinclient_init failures, use if..then..fi instead of the test command. + - Init scripts: Provide status option. * debian/control: + Rename bin:package: x2gothinclient -> x2gothinclient-daemon. diff --git a/displaymanager/init/x2gothinclient-displaymanager.init b/displaymanager/init/x2gothinclient-displaymanager.init index 3754dc7..6923035 100644 --- a/displaymanager/init/x2gothinclient-displaymanager.init +++ b/displaymanager/init/x2gothinclient-displaymanager.init @@ -72,6 +72,13 @@ case "$1" in log_end_msg $? fi ;; + status) + if [ -e /var/run/$NAME.pid ]; then + log_daemon_msg "Status of $DESC" "x2gothinclientd" + start-stop-daemon --oknodo --status --quiet --pidfile /var/run/$NAME.pid + log_end_msg $? + fi + ;; stop) if [ -e /var/run/$NAME.pid ]; then log_daemon_msg "Stopping $DESC" "x2gothinclientd" diff --git a/minidesktop/init/x2gothinclient-minidesktop.init b/minidesktop/init/x2gothinclient-minidesktop.init index 16e6bbf..1b10e82 100644 --- a/minidesktop/init/x2gothinclient-minidesktop.init +++ b/minidesktop/init/x2gothinclient-minidesktop.init @@ -18,7 +18,7 @@ case "$1" in start|"") exit 0 ;; - restart|reload|force-reload) + restart|reload|force-reload|status) echo "Error: argument '$1' not supported" >&2 exit 3 ;; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
-
git-admin＠x2go.org