From 351ac75e9f5498ca17b237dafc04a8232cdf3cde Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 4 Oct 2006 22:14:53 +0000 Subject: fix mismerge --- ChangeLog | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'ChangeLog') 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, ) + 2006-10-03 Bill Nottingham * 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, ) 2006-09-26 Dimitris Glezos -- cgit v1.2.1