summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-01-20 13:03:50 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:03 +0100
commit0f33ac6ac4887510dce038b490ec29c9e36a774b (patch)
tree4e6e1dd29b73c86b754d9136114486c577a4e0bf /helpers
parent44a580e8f9ed3c33bad9c81b4839e4495ad364b0 (diff)
downloadlive-build-0f33ac6ac4887510dce038b490ec29c9e36a774b.zip
live-build-0f33ac6ac4887510dce038b490ec29c9e36a774b.tar.gz
Adding special handling for kde-desktop hook in lh_chroot_hocks.
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_chroot_hooks6
1 files changed, 6 insertions, 0 deletions
diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks
index 04fe487..986aab5 100755
--- a/helpers/lh_chroot_hooks
+++ b/helpers/lh_chroot_hooks
@@ -42,6 +42,12 @@ HOOKS="$(echo ${LH_HOOKS} ${LH_PACKAGES_LISTS} ${LH_TASKS} | sed -e 's| |\n|g' |
for HOOK in ${HOOKS}
do
+ # Special handling for kde
+ if [ "${HOOK}" = "kde-desktop" ] && [ -n "$(echo ${HOOKS} | grep gnome-desktop)" ]
+ then
+ continue
+ fi
+
if [ -f ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" ]
then
# Copying hook