[SCM] debian-live/live-helper branch, master, updated. 1.0_a28-1-7-g545b50e

[Daniel Baumann]

The branch, master has been updated
       via  545b50eeac79bfb5ed48313d1a126aa098dd7e34 (commit)
      from  8975db992b5d24f14fa6337b588d7314ad1b43df (commit)


- Shortlog ------------------------------------------------------------
545b50e helpers/lh_binary_debian-installer

Summary of changes:
 helpers/lh_binary_debian-installer |    6 ++++++
 helpers/lh_config                  |    1 +
 2 files changed, 7 insertions(+), 0 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 545b50eeac79bfb5ed48313d1a126aa098dd7e34
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 19 08:39:19 2007 +0200

    helpers/lh_binary_debian-installer
    helpers/lh_config
    
      * Adding local udeb_exclude file functionality.

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 919ea3a..19d084a 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -362,6 +362,12 @@ grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DISTRIBUTION}"/udeb_exclude > exc
 grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DISTRIBUTION}"/exclude-udebs >> exclude
 grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DISTRIBUTION}"/exclude-udebs-${LH_ARCHITECTURE} >> exclude
 
+# Local exclude file
+if [ -e ../config/binary_debian-installer/udeb_exclude ]
+then
+	cat ../config/binary_debian-installer/udeb_exclude >> exclude
+fi
+
 for EXCLUDE in `cat exclude`
 do
 	rm -f "${EXCLUDE}"_*.udeb
diff --git a/helpers/lh_config b/helpers/lh_config
old mode 100755
new mode 100644
index 9c9d11b..d80dd9d
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -823,6 +823,7 @@ LH_SYSVINIT="${LH_SYSVINIT}"
 EOF
 
 # Creating lh_binary_* configuration
+mkdir -p config/binary_debian-installer
 mkdir -p config/binary_grub
 mkdir -p config/binary_local-debs
 mkdir -p config/binary_local-hooks

-- 
debian-live/live-helper