[SCM] live-build branch, debian, updated. debian/3.0_a48-1-17-g6e10198

Daniel Baumann daniel at debian.org
Mon Jun 4 10:16:04 UTC 2012


The following commit has been merged in the debian branch:
commit 75a671efca00bbce69ac2791d7c574c0c2591058
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu May 31 13:16:19 2012 +0200

    Allowing to use comments in config/environment.{binary,chroot}.

diff --git a/functions/chroot.sh b/functions/chroot.sh
index 10b249f..198f15f 100755
--- a/functions/chroot.sh
+++ b/functions/chroot.sh
@@ -18,7 +18,7 @@ Chroot ()
 
 	if [ -e config/environment.chroot ]
 	then
-		ENV="$(cat config/environment.chroot)"
+		ENV="$(grep -v '^#' config/environment.chroot)"
 	else
 		ENV=""
 	fi
diff --git a/scripts/build/lb b/scripts/build/lb
index ee8bad0..7f2156b 100755
--- a/scripts/build/lb
+++ b/scripts/build/lb
@@ -44,7 +44,7 @@ case "${1}" in
 
 		if [ -e config/environment.binary ]
 		then
-			ENV="$(cat config/environment.binary)"
+			ENV="$(grep -v '^#' config/environment.binary)"
 		else
 			ENV=""
 		fi

-- 
live-build



More information about the debian-live-changes mailing list