From 2459a5a7a9d34b0fe915cab4bfd9f4fdcf5ea33e Mon Sep 17 00:00:00 2001
From: Marcus Sorensen <shadowsor@gmail.com>
Date: Sun, 7 Oct 2012 10:11:30 +0200
Subject: [PATCH] usage: Fix init scripts for RHEL based distros to use
 --pidfile instead of -p

---
 usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 2 +-
 usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 2 +-
 usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 516a84205c9..cb5beb5cff1 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
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 516a84205c9..cb5beb5cff1 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
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 516a84205c9..cb5beb5cff1 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