| 1 |
matsuu 10/08/01 01:12:12 |
| 2 |
|
| 3 |
Modified: puppetmaster.init puppet.init |
| 4 |
Removed: puppet-0.24.6-eix.patch |
| 5 |
puppet-0.24.8-rc-update-show.patch |
| 6 |
Log: |
| 7 |
Fixed pidfile issue, bug #330269. Fixed doc and test handling, bug #329305. |
| 8 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.9 app-admin/puppet/files/puppetmaster.init |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/files/puppetmaster.init?rev=1.9&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/files/puppetmaster.init?rev=1.9&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/files/puppetmaster.init?r1=1.8&r2=1.9 |
| 16 |
|
| 17 |
Index: puppetmaster.init |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppetmaster.init,v |
| 20 |
retrieving revision 1.8 |
| 21 |
retrieving revision 1.9 |
| 22 |
diff -u -r1.8 -r1.9 |
| 23 |
--- puppetmaster.init 21 Jul 2009 22:12:15 -0000 1.8 |
| 24 |
+++ puppetmaster.init 1 Aug 2010 01:12:12 -0000 1.9 |
| 25 |
@@ -1,5 +1,5 @@ |
| 26 |
#!/sbin/runscript |
| 27 |
-# Copyright 1999-2009 Gentoo Foundation |
| 28 |
+# Copyright 1999-2010 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
depend() { |
| 32 |
@@ -24,7 +24,7 @@ |
| 33 |
|
| 34 |
ebegin "Starting puppetmaster" |
| 35 |
start-stop-daemon --start --quiet \ |
| 36 |
- --pidfile "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid" \ |
| 37 |
+ --pidfile "${PUPPETMASTER_PID_DIR}/master.pid" \ |
| 38 |
--exec /usr/bin/puppetmasterd -- ${options} |
| 39 |
eend $? "Failed to start puppetmaster" |
| 40 |
} |
| 41 |
@@ -32,9 +32,9 @@ |
| 42 |
stop() { |
| 43 |
ebegin "Stopping puppetmaster" |
| 44 |
start-stop-daemon --stop --quiet \ |
| 45 |
- --pidfile "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid" |
| 46 |
+ --pidfile "${PUPPETMASTER_PID_DIR}/master.pid" |
| 47 |
local ret=$? |
| 48 |
eend ${ret} "Failed to stop puppetmaster" |
| 49 |
- rm -f "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid" |
| 50 |
+ rm -f "${PUPPETMASTER_PID_DIR}/master.pid" |
| 51 |
return ${ret} |
| 52 |
} |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
1.6 app-admin/puppet/files/puppet.init |
| 57 |
|
| 58 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/files/puppet.init?rev=1.6&view=markup |
| 59 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/files/puppet.init?rev=1.6&content-type=text/plain |
| 60 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/files/puppet.init?r1=1.5&r2=1.6 |
| 61 |
|
| 62 |
Index: puppet.init |
| 63 |
=================================================================== |
| 64 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppet.init,v |
| 65 |
retrieving revision 1.5 |
| 66 |
retrieving revision 1.6 |
| 67 |
diff -u -r1.5 -r1.6 |
| 68 |
--- puppet.init 21 Jul 2009 22:12:15 -0000 1.5 |
| 69 |
+++ puppet.init 1 Aug 2010 01:12:12 -0000 1.6 |
| 70 |
@@ -1,5 +1,5 @@ |
| 71 |
#!/sbin/runscript |
| 72 |
-# Copyright 1999-2009 Gentoo Foundation |
| 73 |
+# Copyright 1999-2010 Gentoo Foundation |
| 74 |
# Distributed under the terms of the GNU General Public License v2 |
| 75 |
|
| 76 |
depend() { |
| 77 |
@@ -24,7 +24,7 @@ |
| 78 |
|
| 79 |
ebegin "Starting puppet" |
| 80 |
start-stop-daemon --start --quiet \ |
| 81 |
- --pidfile "${PUPPET_PID_DIR}/puppetd.pid" \ |
| 82 |
+ --pidfile "${PUPPET_PID_DIR}/agent.pid" \ |
| 83 |
--exec /usr/bin/puppetd -- ${options} |
| 84 |
eend $? "Failed to start puppet" |
| 85 |
} |
| 86 |
@@ -32,9 +32,9 @@ |
| 87 |
stop() { |
| 88 |
ebegin "Stopping puppet" |
| 89 |
start-stop-daemon --stop --quiet \ |
| 90 |
- --pidfile "${PUPPET_PID_DIR}/puppetd.pid" |
| 91 |
+ --pidfile "${PUPPET_PID_DIR}/agent.pid" |
| 92 |
local ret=$? |
| 93 |
eend ${ret} "Failed to stop puppet" |
| 94 |
- rm -f "${PUPPET_PID_DIR}/puppetd.pid" |
| 95 |
+ rm -f "${PUPPET_PID_DIR}/agent.pid" |
| 96 |
return ${ret} |
| 97 |
} |
Archives