* pbuilder-modules (copy_local_configuration): fix the

	rules to copy over to work around debootstrap breakage
	with handling of symlinks.
	Remove the target file prior to copy.

3 files changed, 17 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c0ba2f1..5f29d49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-24  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilder-modules (copy_local_configuration): fix the 
+	rules to copy over to work around debootstrap breakage
+	with handling of symlinks.
+	Remove the target file prior to copy.
+	
 2002-09-22  Junichi Uekawa  <dancer@debian.org>
 
 	* THANKS: updated thanks file.
diff --git a/debian/changelog b/debian/changelog
index 7210ecf..e557852 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pbuilder (0.40) unstable; urgency=low
+
+  * Fix minor glitch with copying /etc files into the chroot
+  which was caused with debootstrap quirks and pbuilder quirk.
+  thanks: Eric Van Buggenhaut <Eric.VanBuggenhaut@AdValvas.be>
+
+ -- Junichi Uekawa <dancer@debian.org>  Tue, 24 Sep 2002 23:26:27 +0900
+
 pbuilder (0.39) unstable; urgency=low
 
   * Fix dereferencing of symlink code in pbuilder create
diff --git a/pbuilder-modules b/pbuilder-modules
index 11a8b6b..e6ca1ae 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -168,7 +168,8 @@ EOF
 function copy_local_configuration () {
     echo " -> copying local configuration"
     for a in hosts hostname resolv.conf; do 
-	cp $( readlink -f /etc/$a ) "$BUILDPLACE/etc/$a";
+	rm -f "$BUILDPLACE/etc/$a"
+	cp $( readlink -f "/etc/$a" ) "$BUILDPLACE/etc/$a";
     done
 }