Merge lp:~timrchavez/live-build/lb-sg-2.x-resolvconf-cleanup into lp:~ce-infrastructure/live-build/lb-sg-2.x

[Timothy R. Chavez]

  * scripts/build/lb_chroot_resolv
    - Add checks for the case where resolv.conf is a symlink and clean-up
      any resolvconf pollution (backported from 3.0~a24-1ubuntu23)

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-18 23:11:05 +0000
+++ debian/changelog	2012-11-14 20:14:21 +0000
@@ -1,3 +1,11 @@
+live-build (2.0.12-2cesg8) lucid; urgency=low
+
+  * scripts/build/lb_chroot_resolv
+    - Add checks for the case where resolv.conf is a symlink and clean-up
+      any resolvconf pollution (backported from 3.0~a24-1ubuntu23)
+
+ -- Timothy Chavez <[e-mail]>  Tue, 13 Nov 2012 14:15:13 -0600
+
 live-build (2.0.12-2cesg7) lucid; urgency=low
 
   * data/debian-cd/quantal:

=== modified file 'scripts/build/lb_chroot_resolv'
--- scripts/build/lb_chroot_resolv	2011-03-09 18:17:33 +0000
+++ scripts/build/lb_chroot_resolv	2012-11-14 20:14:21 +0000
@@ -51,6 +51,10 @@
 			# If you want to have a custom resolv.conf, please
 			# overwrite it with normal local_includes mechanism.
 			Truncate chroot/etc/resolv.conf.orig
+		elif [ -L chroot/etc/resolv.conf ]
+		then
+			# Move resolv.conf aside if it's a symlink (likely resolvconf)
+			mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig
 		fi
 
 		if [ -f /etc/resolv.conf ]
@@ -77,7 +81,7 @@
 			# Copying local resolv.conf
 			cp -a config/chroot_local-includes/etc/resolv.conf chroot/etc/resolv.conf
 			rm -f chroot/etc/resolv.conf.orig
-		elif [ -e chroot/etc/resolv.conf.orig ]
+		elif [ -e chroot/etc/resolv.conf.orig ] || [ -L chroot/etc/resolv.conf.orig ]
 		then
 			# Restoring resolv file or symlink
 			mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf
@@ -86,6 +90,12 @@
 			Truncate chroot/etc/resolv.conf
 		fi
 
+		# Clean up resolvconf's pollution
+		if [ -d chroot/etc/resolvconf/resolv.conf.d ]; then
+			rm -f chroot/etc/resolvconf/resolv.conf.d/original
+			rm -f chroot/etc/resolvconf/resolv.conf.d/tail
+		fi
+
 		# Removing stage file
 		rm -f .stage/chroot_resolv
 		;;