mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Removed spurious dollar signs from Debian init scripts; also cleaned out a couple instances of trailing whitespace
This commit is contained in:
parent
d86e704324
commit
30c503ecd2
3 changed files with 15 additions and 15 deletions
8
debian/salt.salt-master.init
vendored
8
debian/salt.salt-master.init
vendored
|
@ -29,7 +29,7 @@ DEBIAN_VERSION=/etc/debian_version
|
|||
SUSE_RELEASE=/etc/SuSE-release
|
||||
# Source function library.
|
||||
if [ -f $DEBIAN_VERSION ]; then
|
||||
break
|
||||
break
|
||||
elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then
|
||||
. /etc/rc.status
|
||||
else
|
||||
|
@ -50,7 +50,7 @@ findproc() {
|
|||
}
|
||||
|
||||
start() {
|
||||
echo -n $"Starting salt-master daemon: "
|
||||
echo -n "Starting salt-master daemon: "
|
||||
if [ -f $SUSE_RELEASE ]; then
|
||||
startproc -f -p /var/run/$SERVICE.pid /usr/bin/salt-master -d $CONFIG_ARGS
|
||||
rc_status -v
|
||||
|
@ -72,7 +72,7 @@ start() {
|
|||
}
|
||||
|
||||
stop() {
|
||||
echo -n $"Stopping salt-master daemon: "
|
||||
echo -n "Stopping salt-master daemon: "
|
||||
if [ -f $SUSE_RELEASE ]; then
|
||||
killproc -TERM /usr/bin/salt-master
|
||||
rc_status -v
|
||||
|
@ -131,7 +131,7 @@ case "$1" in
|
|||
RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
|
||||
echo "Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
|
10
debian/salt.salt-minion.init
vendored
10
debian/salt.salt-minion.init
vendored
|
@ -29,7 +29,7 @@ DEBIAN_VERSION=/etc/debian_version
|
|||
SUSE_RELEASE=/etc/SuSE-release
|
||||
# Source function library.
|
||||
if [ -f $DEBIAN_VERSION ]; then
|
||||
break
|
||||
break
|
||||
elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then
|
||||
. /etc/rc.status
|
||||
else
|
||||
|
@ -50,14 +50,14 @@ findproc() {
|
|||
}
|
||||
|
||||
start() {
|
||||
echo -n $"Starting salt-minion daemon: "
|
||||
echo -n "Starting salt-minion daemon: "
|
||||
if [ -f $SUSE_RELEASE ]; then
|
||||
startproc -f -p /var/run/$SERVICE.pid /usr/bin/salt-minion -d $CONFIG_ARGS
|
||||
rc_status -v
|
||||
elif [ -e $DEBIAN_VERSION ]; then
|
||||
findproc
|
||||
if [ -n "$PROC_LIST" ]; then
|
||||
echo -n "already started, lock file found"
|
||||
echo -n "already started, lock file found"
|
||||
RETVAL=1
|
||||
elif /usr/bin/python /usr/bin/salt-minion -d; then
|
||||
echo -n "OK"
|
||||
|
@ -72,7 +72,7 @@ start() {
|
|||
}
|
||||
|
||||
stop() {
|
||||
echo -n $"Stopping salt-minion daemon: "
|
||||
echo -n "Stopping salt-minion daemon: "
|
||||
if [ -f $SUSE_RELEASE ]; then
|
||||
killproc -TERM /usr/bin/salt-minion
|
||||
rc_status -v
|
||||
|
@ -131,7 +131,7 @@ case "$1" in
|
|||
RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
|
||||
echo "Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
|
12
debian/salt.salt-syndic.init
vendored
12
debian/salt.salt-syndic.init
vendored
|
@ -17,7 +17,7 @@
|
|||
|
||||
# chkconfig header
|
||||
|
||||
# chkconfig: 2345 99 01
|
||||
# chkconfig: 2345 99 01
|
||||
# description: This is a daemon that controls the salt mininons
|
||||
#
|
||||
# processname: /usr/bin/salt-syndic
|
||||
|
@ -29,7 +29,7 @@ DEBIAN_VERSION=/etc/debian_version
|
|||
SUSE_RELEASE=/etc/SuSE-release
|
||||
# Source function library.
|
||||
if [ -f $DEBIAN_VERSION ]; then
|
||||
break
|
||||
break
|
||||
elif [ -f $SUSE_RELEASE -a -r /etc/rc.status ]; then
|
||||
. /etc/rc.status
|
||||
else
|
||||
|
@ -50,14 +50,14 @@ findproc() {
|
|||
}
|
||||
|
||||
start() {
|
||||
echo -n $"Starting salt-syndic daemon: "
|
||||
echo -n "Starting salt-syndic daemon: "
|
||||
if [ -f $SUSE_RELEASE ]; then
|
||||
startproc -f -p /var/run/$SERVICE.pid /usr/bin/salt-syndic -d $CONFIG_ARGS
|
||||
rc_status -v
|
||||
elif [ -e $DEBIAN_VERSION ]; then
|
||||
findproc
|
||||
if [ -n "$PROC_LIST" ]; then
|
||||
echo -n "already started, lock file found"
|
||||
echo -n "already started, lock file found"
|
||||
RETVAL=1
|
||||
elif /usr/bin/python /usr/bin/salt-syndic -d; then
|
||||
echo -n "OK"
|
||||
|
@ -72,7 +72,7 @@ start() {
|
|||
}
|
||||
|
||||
stop() {
|
||||
echo -n $"Stopping salt-syndic daemon: "
|
||||
echo -n "Stopping salt-syndic daemon: "
|
||||
if [ -f $SUSE_RELEASE ]; then
|
||||
killproc -TERM /usr/bin/salt-syndic
|
||||
rc_status -v
|
||||
|
@ -127,7 +127,7 @@ case "$1" in
|
|||
RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $0 {start|stop|status|restart|reload|force-reload}"
|
||||
echo "Usage: $0 {start|stop|status|restart|reload|force-reload}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
|
Loading…
Add table
Reference in a new issue