Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 78981D2FE for ; Sun, 7 Oct 2012 08:13:41 +0000 (UTC) Received: (qmail 22887 invoked by uid 500); 7 Oct 2012 08:13:41 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 22727 invoked by uid 500); 7 Oct 2012 08:13:40 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 22710 invoked by uid 99); 7 Oct 2012 08:13:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Oct 2012 08:13:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B13A33AF90; Sun, 7 Oct 2012 08:13:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: usage: Fix init scripts for RHEL based distros to use --pidfile instead of -p Message-Id: <20121007081339.B13A33AF90@tyr.zones.apache.org> Date: Sun, 7 Oct 2012 08:13:39 +0000 (UTC) Updated Branches: refs/heads/master a97d2d4f3 -> 2459a5a7a usage: Fix init scripts for RHEL based distros to use --pidfile instead of -p Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2459a5a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2459a5a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2459a5a7 Branch: refs/heads/master Commit: 2459a5a7a9d34b0fe915cab4bfd9f4fdcf5ea33e Parents: a97d2d4 Author: Marcus Sorensen Authored: Sun Oct 7 10:11:30 2012 +0200 Committer: Wido den Hollander Committed: Sun Oct 7 10:11:30 2012 +0200 ---------------------------------------------------------------------- .../centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 2 +- .../fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 2 +- .../rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2459a5a7/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in ---------------------------------------------------------------------- diff --git a/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in b/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in index 516a842..cb5beb5 100755 --- a/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in +++ b/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in @@ -79,7 +79,7 @@ start() { echo -n "Starting $PROGNAME" "$SHORTNAME" - if daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -errfile SYSLOG -Dpid=$$ $CLASS + if daemon --pidfile $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -errfile SYSLOG -Dpid=$$ $CLASS RETVAL=$? then rc=0 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2459a5a7/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in ---------------------------------------------------------------------- diff --git a/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in b/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in index 516a842..cb5beb5 100755 --- a/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in +++ b/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in @@ -79,7 +79,7 @@ start() { echo -n "Starting $PROGNAME" "$SHORTNAME" - if daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -errfile SYSLOG -Dpid=$$ $CLASS + if daemon --pidfile $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -errfile SYSLOG -Dpid=$$ $CLASS RETVAL=$? then rc=0 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2459a5a7/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in ---------------------------------------------------------------------- diff --git a/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in b/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in index 516a842..cb5beb5 100644 --- a/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in +++ b/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in @@ -79,7 +79,7 @@ start() { echo -n "Starting $PROGNAME" "$SHORTNAME" - if daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -errfile SYSLOG -Dpid=$$ $CLASS + if daemon --pidfile $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -errfile SYSLOG -Dpid=$$ $CLASS RETVAL=$? then rc=0