From 9dd57c22b02afcddb1d6c8ddc3e1b578961454e3 Mon Sep 17 00:00:00 2001
From: John Kinsella <jlk@stratosec.co>
Date: Mon, 17 Feb 2014 10:00:36 -0800
Subject: [PATCH] CLOUDSTACK-6129: removing hard-coded script names

Replacing whatami with $0 which is how UNIX shell scripts should get the
script's name.

BUG-ID: CLOUDSTACK-6129
Bugfix-for:
Reviewed-by:
Reported-by:
Signed-off-by: John Kinsella <jlk@stratosec.co> 1392660036 -0800
---
 agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in | 8 +++-----
 agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in | 8 +++-----
 .../distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in | 8 +++-----
 agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in   | 8 +++-----
 agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in        | 8 +++-----
 packaging/centos63/cloud-agent.rc                         | 8 +++-----
 packaging/centos63/cloud-ipallocator.rc                   | 8 +++-----
 .../centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in    | 8 +++-----
 .../fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in    | 8 +++-----
 .../opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in       | 8 +++-----
 .../rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in      | 8 +++-----
 python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in | 8 +++-----
 .../distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in  | 8 +++-----
 .../centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  | 8 +++-----
 .../fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in  | 8 +++-----
 .../rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in    | 8 +++-----
 .../ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in       | 8 +++-----
 17 files changed, 51 insertions(+), 85 deletions(-)

diff --git a/agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in b/agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in
index fb82ebfab99..60e1e045b24 100755
--- a/agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in
+++ b/agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in
@@ -24,12 +24,10 @@
 
 . /etc/rc.d/init.d/functions
 
-whatami=cloud-agent
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=@PIDDIR@/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@
 PROGNAME="Cloud Agent"
@@ -114,7 +112,7 @@ case "$1" in
 	fi
 	;;
   *)
-	echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
+	echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
 	RETVAL=3
 esac
 
diff --git a/agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in b/agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in
index fb82ebfab99..60e1e045b24 100755
--- a/agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in
+++ b/agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in
@@ -24,12 +24,10 @@
 
 . /etc/rc.d/init.d/functions
 
-whatami=cloud-agent
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=@PIDDIR@/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@
 PROGNAME="Cloud Agent"
@@ -114,7 +112,7 @@ case "$1" in
 	fi
 	;;
   *)
-	echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
+	echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
 	RETVAL=3
 esac
 
diff --git a/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in b/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in
index ea1c6059b60..2422268f416 100644
--- a/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in
+++ b/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in
@@ -31,12 +31,10 @@
 . /lib/lsb/init-functions
 . /etc/rc.status
 
-whatami=cloud-agent
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=@PIDDIR@/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@
 PROGNAME="Cloud Agent"
@@ -166,7 +164,7 @@ case "$1" in
 	start
 	;;
   *)
-	echo $"Usage: $whatami {start|stop|restart|status|help}"
+	echo $"Usage: $SHORTNAME {start|stop|restart|status|help}"
 	RETVAL=3
 esac
 
diff --git a/agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in b/agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in
index fb82ebfab99..60e1e045b24 100644
--- a/agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in
+++ b/agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in
@@ -24,12 +24,10 @@
 
 . /etc/rc.d/init.d/functions
 
-whatami=cloud-agent
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=@PIDDIR@/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@
 PROGNAME="Cloud Agent"
@@ -114,7 +112,7 @@ case "$1" in
 	fi
 	;;
   *)
-	echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
+	echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
 	RETVAL=3
 esac
 
diff --git a/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in b/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in
index ea1c6059b60..2422268f416 100644
--- a/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in
+++ b/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in
@@ -31,12 +31,10 @@
 . /lib/lsb/init-functions
 . /etc/rc.status
 
-whatami=cloud-agent
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=@PIDDIR@/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@
 PROGNAME="Cloud Agent"
@@ -166,7 +164,7 @@ case "$1" in
 	start
 	;;
   *)
-	echo $"Usage: $whatami {start|stop|restart|status|help}"
+	echo $"Usage: $SHORTNAME {start|stop|restart|status|help}"
 	RETVAL=3
 esac
 
diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc
index ab49524af4b..40c358e36b6 100755
--- a/packaging/centos63/cloud-agent.rc
+++ b/packaging/centos63/cloud-agent.rc
@@ -24,12 +24,10 @@
 
 . /etc/rc.d/init.d/functions
 
-whatami=cloudstack-agent
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=/var/run/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=/var/run/"$SHORTNAME".pid
 LOCKFILE=/var/lock/subsys/"$SHORTNAME"
 LOGDIR=/var/log/cloudstack/agent
 LOGFILE=${LOGDIR}/agent.log
@@ -112,7 +110,7 @@ case "$1" in
         fi
         ;;
     *)
-    echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
+    echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
     RETVAL=3
 esac
 
diff --git a/packaging/centos63/cloud-ipallocator.rc b/packaging/centos63/cloud-ipallocator.rc
index 08cf9c88a0f..9a24d8dfc8a 100755
--- a/packaging/centos63/cloud-ipallocator.rc
+++ b/packaging/centos63/cloud-ipallocator.rc
@@ -23,12 +23,10 @@
 
 . /etc/rc.d/init.d/functions
 
-whatami=cloud-external-ipallocator
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=/var/run/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=/var/run/"$SHORTNAME".pid
 LOCKFILE=/var/lock/subsys/"$SHORTNAME"
 LOGFILE=/var/log/cloudstack/ipallocator/ipallocator.log
 PROGNAME="External IPAllocator"
@@ -90,7 +88,7 @@ case "$1" in
 	fi
 	;;
   *)
-	echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
+	echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
 	RETVAL=3
 esac
 
diff --git a/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in b/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
index 6d929c0a27e..b6720f5b639 100755
--- a/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
+++ b/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
@@ -23,12 +23,10 @@
 
 . /etc/rc.d/init.d/functions
 
-whatami=cloud-external-ipallocator
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=@PIDDIR@/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@IPALOCATORLOG@
 PROGNAME="External IPAllocator"
@@ -90,7 +88,7 @@ case "$1" in
 	fi
 	;;
   *)
-	echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
+	echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
 	RETVAL=3
 esac
 
diff --git a/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in b/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
index a21070dadf8..aa7e8cf8820 100755
--- a/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
+++ b/python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
@@ -23,12 +23,10 @@
 
 . /etc/rc.d/init.d/functions
 
-whatami=cloud-external-ipallocator
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=@PIDDIR@/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@
 PROGNAME="Cloud Agent"
@@ -90,7 +88,7 @@ case "$1" in
 	fi
 	;;
   *)
-	echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
+	echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
 	RETVAL=3
 esac
 
diff --git a/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in b/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in
index b12e16b050d..7aa456df51c 100755
--- a/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in
+++ b/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in
@@ -30,12 +30,10 @@
 . /lib/lsb/init-functions
 . /etc/rc.status
 
-whatami=cloud-external-ipallocator
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=@PIDDIR@/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@
 PROGNAME="Cloud Agent"
@@ -110,7 +108,7 @@ case "$1" in
 	start
 	;;
   *)
-	echo $"Usage: $whatami {start|stop|restart|status|help}"
+	echo $"Usage: $SHORTNAME {start|stop|restart|status|help}"
 	RETVAL=3
 esac
 
diff --git a/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in b/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
index a21070dadf8..aa7e8cf8820 100644
--- a/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
+++ b/python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
@@ -23,12 +23,10 @@
 
 . /etc/rc.d/init.d/functions
 
-whatami=cloud-external-ipallocator
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=@PIDDIR@/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@
 PROGNAME="Cloud Agent"
@@ -90,7 +88,7 @@ case "$1" in
 	fi
 	;;
   *)
-	echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
+	echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
 	RETVAL=3
 esac
 
diff --git a/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in b/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in
index b12e16b050d..7aa456df51c 100755
--- a/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in
+++ b/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in
@@ -30,12 +30,10 @@
 . /lib/lsb/init-functions
 . /etc/rc.status
 
-whatami=cloud-external-ipallocator
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=@PIDDIR@/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@
 PROGNAME="Cloud Agent"
@@ -110,7 +108,7 @@ case "$1" in
 	start
 	;;
   *)
-	echo $"Usage: $whatami {start|stop|restart|status|help}"
+	echo $"Usage: $SHORTNAME {start|stop|restart|status|help}"
 	RETVAL=3
 esac
 
diff --git a/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in b/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in
index 3dcc471cf68..ec84962b669 100755
--- a/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in
+++ b/python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in
@@ -24,12 +24,10 @@
 . /lib/lsb/init-functions
 . /etc/default/rcS
 
-whatami=cloud-external-ipallocator
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=@PIDDIR@/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@
 PROGNAME="Cloud Agent"
@@ -104,7 +102,7 @@ case "$1" in
 	start
 	;;
   *)
-	echo $"Usage: $whatami {start|stop|restart|status|help}"
+	echo $"Usage: $SHORTNAME {start|stop|restart|status|help}"
 	RETVAL=3
 esac
 
diff --git a/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
index 47fdaef1d96..76ee681dbe9 100644
--- a/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
+++ b/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
@@ -24,12 +24,10 @@
 
 . /etc/rc.d/init.d/functions
 
-whatami=cloud-console-proxy
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=@PIDDIR@/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@CPLOG@
 PROGNAME="Cloud Console Proxy"
@@ -90,7 +88,7 @@ case "$1" in
 	fi
 	;;
   *)
-	echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
+	echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
 	RETVAL=3
 esac
 
diff --git a/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
index 47fdaef1d96..76ee681dbe9 100644
--- a/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
+++ b/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
@@ -24,12 +24,10 @@
 
 . /etc/rc.d/init.d/functions
 
-whatami=cloud-console-proxy
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=@PIDDIR@/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@CPLOG@
 PROGNAME="Cloud Console Proxy"
@@ -90,7 +88,7 @@ case "$1" in
 	fi
 	;;
   *)
-	echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
+	echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
 	RETVAL=3
 esac
 
diff --git a/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
index 47fdaef1d96..76ee681dbe9 100644
--- a/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
+++ b/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
@@ -24,12 +24,10 @@
 
 . /etc/rc.d/init.d/functions
 
-whatami=cloud-console-proxy
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=@PIDDIR@/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@CPLOG@
 PROGNAME="Cloud Console Proxy"
@@ -90,7 +88,7 @@ case "$1" in
 	fi
 	;;
   *)
-	echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
+	echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
 	RETVAL=3
 esac
 
diff --git a/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in b/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in
index 550f2fbedfa..c83f00aa76d 100755
--- a/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in
+++ b/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in
@@ -25,12 +25,10 @@
 . /lib/lsb/init-functions
 . /etc/default/rcS
 
-whatami=cloud-console-proxy
-
 # set environment variables
 
-SHORTNAME="$whatami"
-PIDFILE=@PIDDIR@/"$whatami".pid
+SHORTNAME="$0"
+PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@CPLOG@
 PROGNAME="Cloud Console Proxy"
@@ -104,7 +102,7 @@ case "$1" in
 	start
 	;;
   *)
-	echo $"Usage: $whatami {start|stop|restart|status|help}"
+	echo $"Usage: $SHORTNAME {start|stop|restart|status|help}"
 	RETVAL=3
 esac