[PATCH/puppet 1/1] (#5445) Create /var/lib/puppet ahead of time in OS X pkg creator

1 view
Skip to first unread message

Nigel Kersten

unread,
Dec 2, 2010, 11:46:55 AM12/2/10
to puppe...@googlegroups.com

Signed-off-by: Nigel Kersten <ni...@puppetlabs.com>
---
conf/osx/createpackage.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/conf/osx/createpackage.sh b/conf/osx/createpackage.sh
index 563b69c..24e12cf 100755
--- a/conf/osx/createpackage.sh
+++ b/conf/osx/createpackage.sh
@@ -50,6 +50,7 @@ function find_puppet_root() {

function install_puppet() {
echo "Installing Puppet to ${pkgroot}"
+ mkdir -p "${pkgroot}/var/lib/puppet"
"${installer}" --destdir="${pkgroot}" --bindir="${BINDIR}" --sbindir="${SBINDIR}" --sitelibdir="${SITELIBDIR}"
chown -R root:admin "${pkgroot}"
}
--
1.7.3.1

Eric Sorenson

unread,
Dec 2, 2010, 2:16:04 PM12/2/10
to puppe...@googlegroups.com
Brutal but this would also fix #3962 for people who used the pkg.

> --
> You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
> To post to this group, send email to puppe...@googlegroups.com.
> To unsubscribe from this group, send email to puppet-dev+...@googlegroups.com.
> For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
>

Nigel Kersten

unread,
Dec 2, 2010, 2:21:01 PM12/2/10
to puppe...@googlegroups.com
On Thu, Dec 2, 2010 at 11:16 AM, Eric Sorenson <eric.s...@me.com> wrote:
> Brutal but this would also fix #3962 for people who used the pkg.

Ah. That's where that bug was...

I'm hesitant to change to the /var/db/puppet setup yet, as I'm not
shipping puppet.conf in the pkgs yet, and we don't have a good way of
dealing with the equivalent of "conffiles" with OS X pkgs, so we're
very reliant upon the defaults internally, which don't jive with OS X
all that well :(

I would like us to address the /var/db situation for 2.7 though. I
just don't have any good ideas how we can do it.

--
Nigel Kersten - Puppet Labs -  http://www.puppetlabs.com

Paul Berry

unread,
Dec 7, 2010, 4:30:56 PM12/7/10
to puppe...@googlegroups.com
Nigel--

Could we have a message in the commit (and in the bug report) explaining why this change is beneficial?  We'd be happy to accept it into the code base but we'd like to be able to trace the reason why it was added.

Nigel Kersten

unread,
Dec 7, 2010, 7:17:06 PM12/7/10
to puppe...@googlegroups.com

Sure. I'll update it later. Can you mark the original bug as code
insufficient or something? I'm flitting on and off-line at the moment.

Basically /var/lib doesn't exist on OS X at all, so /var/lib/puppet
doesn't get made.

We should ultimately move to /var/db/puppet, but that change should be
left for a major version.

Paul Berry

unread,
Dec 7, 2010, 7:31:04 PM12/7/10
to puppe...@googlegroups.com
No problem.  The ticket's already updated.  There's no hurry on this one AFAIK so feel free to work on it when you get a chance.
Reply all
Reply to author
Forward
0 new messages