diff options
| author |   Tiziano Müller <dev-zero@gentoo.org> | 2008-06-16 06:42:46 +0000 |
|---|---|---|
| committer | Tiziano Müller <dev-zero@gentoo.org> | 2008-06-16 06:42:46 +0000 |
| commit | 21b68cd06777bab02622a770f322de12211c5cb5 (patch) | |
| tree | 08655e72dfc2985096a05593ef5dae70da4bdb36 /app-admin/puppet/files | |
| parent | Marked ppc stable for bug #219933. (diff) | |
| download | historical-21b68cd06777bab02622a770f322de12211c5cb5.tar.gz historical-21b68cd06777bab02622a770f322de12211c5cb5.tar.bz2 historical-21b68cd06777bab02622a770f322de12211c5cb5.zip | |
Added fix to make scripts work with baselayout-2/openrc (bug #218071)
Package-Manager: portage-2.1.5.4
Diffstat (limited to 'app-admin/puppet/files')
| -rw-r--r-- | app-admin/puppet/files/puppet-0.24.4-openrc_initd.patch | 12 | ||||
| -rwxr-xr-x | app-admin/puppet/files/puppetmaster.init | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/app-admin/puppet/files/puppet-0.24.4-openrc_initd.patch b/app-admin/puppet/files/puppet-0.24.4-openrc_initd.patch new file mode 100644 index 000000000000..c26c6ca37a68 --- /dev/null +++ b/app-admin/puppet/files/puppet-0.24.4-openrc_initd.patch @@ -0,0 +1,12 @@ +diff -Naur puppet-0.24.4.orig/conf/gentoo/init.d/puppet puppet-0.24.4/conf/gentoo/init.d/puppet +--- puppet-0.24.4.orig/conf/gentoo/init.d/puppet 2008-06-11 19:06:26.000000000 +0200 ++++ puppet-0.24.4/conf/gentoo/init.d/puppet 2008-06-11 19:06:45.000000000 +0200 +@@ -24,7 +24,7 @@ + [[ -n "${PUPPET_EXTRA_OPTS}" ]] && options="${options} ${PUPPET_EXTRA_OPTS}" + + ebegin "Starting puppet" +- start-stop-daemon --start --quiet --exec /usr/bin/puppetd -- ${options} ++ start-stop-daemon --start --quiet --exec /usr/bin/ruby /usr/bin/puppetd -- ${options} + eend $? "Failed to start puppet" + } + diff --git a/app-admin/puppet/files/puppetmaster.init b/app-admin/puppet/files/puppetmaster.init index 09def2a47c9b..60231530a08e 100755 --- a/app-admin/puppet/files/puppetmaster.init +++ b/app-admin/puppet/files/puppetmaster.init @@ -34,7 +34,7 @@ start() { [[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}" ebegin "Starting puppetmaster" - start-stop-daemon --start --quiet --exec /usr/bin/puppetmasterd \ + start-stop-daemon --start --quiet --exec /usr/bin/ruby /usr/bin/puppetmasterd \ -- ${options} eend $? "Failed to start puppetmaster" } |