aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2006-10-04 22:14:53 +0000
committerBill Nottingham <notting@redhat.com>2006-10-04 22:14:53 +0000
commit351ac75e9f5498ca17b237dafc04a8232cdf3cde (patch)
treefd5fb924ccc45f92358eebea4678299f18be979d /rc.d
parent92f7a1904811d41dee7159545b912e9e927a9d75 (diff)
downloadinitscripts-351ac75e9f5498ca17b237dafc04a8232cdf3cde.tar
initscripts-351ac75e9f5498ca17b237dafc04a8232cdf3cde.tar.gz
initscripts-351ac75e9f5498ca17b237dafc04a8232cdf3cde.tar.bz2
initscripts-351ac75e9f5498ca17b237dafc04a8232cdf3cde.tar.xz
initscripts-351ac75e9f5498ca17b237dafc04a8232cdf3cde.zip
fix mismerger8-44
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/rc.sysinit11
1 files changed, 6 insertions, 5 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 453b11fd..d9d84047 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -591,14 +591,15 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then
# state on an NFS server.
mount -t nfs $CLIENTSTATE/$HOSTNAME $STATE_MOUNT -o rw,nolock
- if [ -d $STATE_MOUNT/etc ]; then
- touch $STATE_MOUNT/files
- mount -t nfs $CLIENTSTATE/files $STATE_MOUNT/files -o rw,nolock
- fi
-
fi
if [ -d $STATE_MOUNT/etc ]; then
+ # Copy the puppet CA's cert from the r/o image into the
+ # state directory so that we can create a bind mount on
+ # the ssl directory for storing the client cert. I'd really
+ # rather have a unionfs to deal with this stuff
+ cp --parents -f -p /var/lib/puppet/ssl/certs/ca.pem $STATE_MOUNT 2>/dev/null
+
# In the future this will be handled by puppet
for i in $(grep -v "^#" $STATE_MOUNT/files); do
if [ -e $i ]; then