[Pbuilder-maint] Bug#391915: pbuilder-uml: Fix for overwriting in-chroot network configuration not quite correct

[Paul TBBle Hampson]

found 391915 0.165
Thankyou

The fix for #391915 as applied in 0.165 isn't quite correct,
it still has an unconditional rm -f "$BUILDPLACE/etc/$a" outside
the check for an existing /etc/$a to copy into its place.

The following patch fixes this.

--- pbuilder-modules.org	2007-03-30 21:35:21.000000000 +1000
+++ pbuilder-modules	2007-03-31 23:14:19.000000000 +1000
@@ -328,7 +328,6 @@
 function copy_local_configuration () {
     echo " -> copying local configuration"
     for a in hosts hostname resolv.conf; do 
-	rm -f "$BUILDPLACE/etc/$a"
 	if [ -f "/etc/$a" ]; then
 		rm -f "$BUILDPLACE/etc/$a"
 		cp $( readlink -f "/etc/$a" ) "$BUILDPLACE/etc/$a";

-- 
Paul "TBBle" Hampson, Paul.Hampson at Pobox.com

Shorter .sig for a more eco-friendly paperless office.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/pbuilder-maint/attachments/20070331/ead458ae/attachment.pgp