Changes committed to git://oss.sgi.com:8090/nathans/pcp.git
build/rpm/pcp.spec.in | 13 +++++--------
configure.in | 11 +++++++++++
src/include/pcp.conf.in | 5 +++--
src/pmcd/rc-proc.sh | 11 +++++------
4 files changed, 24 insertions(+), 16 deletions(-)
commit 3e795c603c847e89ade30a9e3b7aaab92642a382
Merge: 19f1200... fc11f09...
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Fri Mar 14 10:55:27 2008 +1100
Merge branch 'nathans' of git://oss.sgi.com:8090/nathans/pcp into
nathans
commit 19f1200f4f4bf7fe70752607df575f00e2374b69
Author: Michael Newton <kimbrr@xxxxxxx>
Date: Fri Mar 14 09:33:02 2008 +1100
[PATCH] installing pcp requires `which`
We have had a longstanding puzzle as to why, when a whole-machine
image
that includes pcp is constructed in a chroot, pcp is chkconfig off
when
the image comes to be used. Turns out to be due to `which` not being
available in the rpm post-install ops in the chroot.
Investigation suggests that using `which` from bash can be unsafe
even
when its available, so the best solution seems to be to use `type`
instead
in these cases. Here I simply say, use `type` if `sh -c 'type -p
sh'`
succeeds (I think this makes sense for linux/bash); otherwise use
which
There are other uses of `which` elsewhere that can be switched over
to
also use $PCP_WHICH_PROG should it ever turn out that there are any
real
systems that dont install `which`, or if there are problems caused
by `which` using a different PATH to that used by bash. The current
priority was just to catch those uses that occur during install.
|