etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
John Kinsella 2014-02-17 10:00:36 -08:00
parent 9f72443bb1
commit 9dd57c22b0
17 changed files with 51 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in
View File

@ -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

8
agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in
View File

@ -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

8
agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in
View File

@ -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

8
agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in
View File

@ -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

8
agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in
View File

@ -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

8
packaging/centos63/cloud-agent.rc
View File

@ -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

8
packaging/centos63/cloud-ipallocator.rc
View File

@ -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

8
python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
View File

@ -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

8
python/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
View File

@ -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

8
python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in
View File

@ -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

8
python/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in
View File

@ -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

8
python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in
View File

@ -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

8
python/distro/ubuntu/SYSCONFDIR/init.d/cloud-ipallocator.in
View File

@ -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

8
systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
View File

@ -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

8
systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
View File

@ -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

8
systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in
View File

@ -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

8
systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in
View File

@ -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