summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-01-20 13:03:50 +0100
committerDaniel Baumann <daniel@debian.org>2010-01-20 13:03:50 +0100
commitf358b604c670a0d53542f8a2aa339a630f108fd6 (patch)
tree4e6e1dd29b73c86b754d9136114486c577a4e0bf
parent212b6a917563a697faa9f72e2a2a5864d3608f96 (diff)
downloadvyos-live-build-f358b604c670a0d53542f8a2aa339a630f108fd6.tar.gz
vyos-live-build-f358b604c670a0d53542f8a2aa339a630f108fd6.zip
Adding special handling for kde-desktop hook in lh_chroot_hocks.
-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 04fe4876a..986aab593 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