r2609 - in dists/trunk/live-helper: debian docs functions

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-28 15:23:54 +0000 (Sat, 28 Jul 2007)
New Revision: 2609

Modified:
   dists/trunk/live-helper/debian/changelog
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/functions/chroot.sh
Log:


Modified: dists/trunk/live-helper/debian/changelog
===================================================================
--- dists/trunk/live-helper/debian/changelog	2007-07-28 15:06:25 UTC (rev 2608)
+++ dists/trunk/live-helper/debian/changelog	2007-07-28 15:23:54 UTC (rev 2609)
@@ -1,6 +1,7 @@
 live-helper (1.0~a21-1) UNRELEASED; urgency=medium
 
-  * New upstream release.
+  * New upstream release:
+    - Suppresses xorg configuration in chroot (Closes: #430566).
 
  -- Daniel Baumann <daniel at debian.org>  Mon, 30 Jul 2007 00:00:00 +0200
 

Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-07-28 15:06:25 UTC (rev 2608)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-07-28 15:23:54 UTC (rev 2609)
@@ -1,3 +1,9 @@
+2007-07-28  Daniel Baumann  <daniel at debian.org>
+
+	* functions/chroot.sh:
+	  - Added XORG_CONFIG="custom" to chroot call in order to disable
+	    xserver-xorg.postinst (Closes: #430566).
+
 2007-07-27  Daniel Baumann  <daniel at debian.org>
 
 	* Makefile, debian/postinst, prerm:

Modified: dists/trunk/live-helper/functions/chroot.sh
===================================================================
--- dists/trunk/live-helper/functions/chroot.sh	2007-07-28 15:06:25 UTC (rev 2608)
+++ dists/trunk/live-helper/functions/chroot.sh	2007-07-28 15:23:54 UTC (rev 2609)
@@ -15,7 +15,7 @@
 
 	# Executing commands in chroot
 	Echo_debug "Executing: ${COMMANDS}"
-	${LH_ROOT_COMMAND} chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" ${COMMANDS}
+	${LH_ROOT_COMMAND} chroot chroot /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" ftp_proxy="${LH_APT_FTPPROXY}" http_proxy="${LH_APT_HTTPPROXY}" DEBIAN_FRONTEND="${LH_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LH_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" XORG_CONFIG="custom" ${COMMANDS}
 
 	return "${?}"
 }