[SCM] Debian Live build scripts branch, master, updated. 1.0.3-2-68-g269c6e7

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 269c6e7c1b9ca4b3ec36d63f3f2e3e8811a59681
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jun 9 10:00:01 2009 +0200

    Emitting a warning if resolvconf is detected on the to be generated live system. Beware of resolvconf, it's broken beyond repair.

diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index 6ed9ed8..1992b80 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -174,5 +174,13 @@ then
 	ln -s /proc/mounts chroot/etc/mtab
 fi
 
+# Show popular warnings
+if [ -e chroot/etc/init.d/resolvconf ]
+then
+	Echo_warning "Your live system appears to includes resolvconf which is by its nature incompatible in most ways with debian-live."
+	Echo_warning "Keeping resolvconf installed *can* lead to broken network support in the resulting live system."
+	Echo_warning "Unless you really know what you are doing, we recommend that you neither install resolvconf explicitly nor implicitly through another package's relation (e.g. by having automatic installation of recommended packages enabled)."
+fi
+
 # Creating stage file
 Create_stagefile .stage/chroot_hacks

-- 
Debian Live build scripts