From 9e40c9f2ab988d0b33422f95d1d49a4a7a1282dc Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 1 Feb 2014 09:04:28 +0000 Subject: [PATCH] Include the documentation for the daemons running function --- README.rst | 13 +++++++++++++ bootstrap-salt.sh | 8 ++++++++ 2 files changed, 21 insertions(+) diff --git a/README.rst b/README.rst index cd6bcb2..8c36162 100644 --- a/README.rst +++ b/README.rst @@ -268,6 +268,19 @@ In order to install salt for a distribution you need to define: they're not running. +7. Optionally, define a daemons running function, one of: + +.. code:: bash + + daemons_running___ + daemons_running____ + daemons_running__ + daemons_running___ + daemons_running__ + daemons_running_ + daemons_running [THIS ONE IS ALREADY DEFINED AS THE DEFAULT] + + ---- Below is an example for Ubuntu Oneiric(the example may not be up to date with the script): diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 7efb8b3..9026adc 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -1311,6 +1311,14 @@ movefile() { # NOTE: The start daemons function should be able to restart any daemons # which are running, or start if they're not running. # +# Optionally, define a daemons running function, one of: +# 1. daemons_running___ +# 2. daemons_running____ +# 3. daemons_running__ +# 4 daemons_running___ +# 5. daemons_running__ +# 6. daemons_running_ +# 7. daemons_running [THIS ONE IS ALREADY DEFINED AS THE DEFAULT] ##############################################################################