aboutsummaryrefslogtreecommitdiffstats
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
parent92f7a1904811d41dee7159545b912e9e927a9d75 (diff)
downloadinitscripts-351ac75e9f5498ca17b237dafc04a8232cdf3cde.tar
initscripts-351ac75e9f5498ca17b237dafc04a8232cdf3cde.tar.gz
initscripts-351ac75e9f5498ca17b237dafc04a8232cdf3cde.tar.bz2
initscripts-351ac75e9f5498ca17b237dafc04a8232cdf3cde.tar.xz
initscripts-351ac75e9f5498ca17b237dafc04a8232cdf3cde.zip
fix mismerger8-44
-rw-r--r--ChangeLog13
-rw-r--r--initscripts.spec1
-rwxr-xr-xrc.d/rc.sysinit11
3 files changed, 15 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 340c0618..0218fd21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,14 @@
* rc.d/rc.sysinit: redirect stderr (#209204)
+ * rc.d/rc.sysinit: Fix mismerged patch from 8.43-1:
+
+ Also check for localhost.localdomain when resetting
+ the hostname for stateless clients.
+ Remove explicit mount of $STATE_MOUNT/.files.
+ Copy the puppet CA's certificate from the r/o image into $STATE_MOUNT.
+ (#206331, <law@redhat.com>)
+
2006-10-03 Bill Nottingham <notting@redhat.com>
* rwtab: fix iscsi take 2 (#208864)
@@ -69,11 +77,6 @@
* sysconfig.txt: clarify font options (#206106)
- * rc.d/rc.sysinit: Also check for localhost.localdomain when resetting
- the hostname for stateless clients.
- Remove explicit mount of $STATE_MOUNT/.files.
- Copy the puppet CA's certificate from the r/o image into $STATE_MOUNT.
- (#206331, <law@redhat.com>)
2006-09-26 Dimitris Glezos <dimitris@glezos.com>
diff --git a/initscripts.spec b/initscripts.spec
index 0f33613e..4d507bfd 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -208,6 +208,7 @@ rm -rf $RPM_BUILD_ROOT
- rc.sysinit: redirect stderr from setsysfont (#209204, indirectly)
- rwtab: fix iscsi file location (#208864)
- translation updates: el, da, as, or
+- fix stateless updates (#206331, <law@redhat.com>)
* Wed Sep 27 2006 Bill Nottingham <notting@redhat.com> 8.43-1
- move ccwgroup initialization to a udev rule (should fix #199139,
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