| 1 |
dev-zero 08/09/29 12:48:33 |
| 2 |
|
| 3 |
Modified: puppet.init puppetmaster.init |
| 4 |
Log: |
| 5 |
Removed bashism from init-scripts |
| 6 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc6 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 app-admin/puppet/files/puppet.init |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet.init?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet.init?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppet.init?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: puppet.init |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppet.init,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- puppet.init 24 Sep 2008 14:49:04 -0000 1.2 |
| 22 |
+++ puppet.init 29 Sep 2008 12:48:32 -0000 1.3 |
| 23 |
@@ -8,7 +8,7 @@ |
| 24 |
} |
| 25 |
|
| 26 |
checkconfig() { |
| 27 |
- if [[ ! -d "${PUPPET_PID_DIR}" ]] ; then |
| 28 |
+ if [ ! -d "${PUPPET_PID_DIR}" ] ; then |
| 29 |
eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory" |
| 30 |
return 1 |
| 31 |
fi |
| 32 |
@@ -20,7 +20,7 @@ |
| 33 |
checkconfig || return $? |
| 34 |
|
| 35 |
local options="" |
| 36 |
- [[ -n "${PUPPET_EXTRA_OPTS}" ]] && options="${options} ${PUPPET_EXTRA_OPTS}" |
| 37 |
+ [ -n "${PUPPET_EXTRA_OPTS}" ] && options="${options} ${PUPPET_EXTRA_OPTS}" |
| 38 |
|
| 39 |
ebegin "Starting puppet" |
| 40 |
start-stop-daemon --start --quiet \ |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.5 app-admin/puppet/files/puppetmaster.init |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?rev=1.5&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?rev=1.5&content-type=text/plain |
| 48 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/puppet/files/puppetmaster.init?r1=1.4&r2=1.5 |
| 49 |
|
| 50 |
Index: puppetmaster.init |
| 51 |
=================================================================== |
| 52 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppetmaster.init,v |
| 53 |
retrieving revision 1.4 |
| 54 |
retrieving revision 1.5 |
| 55 |
diff -u -r1.4 -r1.5 |
| 56 |
--- puppetmaster.init 24 Sep 2008 14:49:04 -0000 1.4 |
| 57 |
+++ puppetmaster.init 29 Sep 2008 12:48:32 -0000 1.5 |
| 58 |
@@ -10,13 +10,13 @@ |
| 59 |
} |
| 60 |
|
| 61 |
checkconfig() { |
| 62 |
- if [[ ! -d "${PUPPETMASTER_PID_DIR}" ]] ; then |
| 63 |
+ if [ ! -d "${PUPPETMASTER_PID_DIR}" ] ; then |
| 64 |
eerror "Please make sure PUPPETMASTER_PID_DIR is defined and points to a existing directory" |
| 65 |
return 1 |
| 66 |
fi |
| 67 |
|
| 68 |
local site_manifest="/etc/puppet/manifests/site.pp" |
| 69 |
- [[ -n "${PUPPETMASTER_MANIFEST}" ]] && site_manifest="${PUPPETMASTER_MANIFEST}" |
| 70 |
+ [ -n "${PUPPETMASTER_MANIFEST}" ] && site_manifest="${PUPPETMASTER_MANIFEST}" |
| 71 |
|
| 72 |
if [ ! -f "${site_manifest}" ] ; then |
| 73 |
eerror "Please create ${site_manifest} before running puppet" |
| 74 |
@@ -30,9 +30,9 @@ |
| 75 |
checkconfig || return $? |
| 76 |
|
| 77 |
local options="" |
| 78 |
- [[ -n "${PUPPETMASTER_MANIFEST}" ]] && options="${options} --manifest=${PUPPETMASTER_MANIFEST}" |
| 79 |
- [[ -n "${PUPPETMASTER_LOG}" ]] && options="${options} --logdest=${PUPPETMASTER_LOG}" |
| 80 |
- [[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}" |
| 81 |
+ [ -n "${PUPPETMASTER_MANIFEST}" ] && options="${options} --manifest=${PUPPETMASTER_MANIFEST}" |
| 82 |
+ [ -n "${PUPPETMASTER_LOG}" ] && options="${options} --logdest=${PUPPETMASTER_LOG}" |
| 83 |
+ [ -n "${PUPPETMASTER_EXTRA_OPTS}" ] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}" |
| 84 |
|
| 85 |
ebegin "Starting puppetmaster" |
| 86 |
start-stop-daemon --start --quiet \ |
Archives