Moving 'default' hooks for minimal and stripped to example hooks, they will have to be enabled manually now (Closes: #627183).

Previously, there were a couple of hooks that were automatically run
for some image flavours. This came back from the old days when we
had to deconfigure gdm and enable kdm explicitly for kde images.

After lenny, this hack was not needed anymore, and there's not much
sense to keep the mechanism in place at all. Better, let's treat all
images the same way wrt/ hooks and don't do special automagics.

The only images that is of concern of are minimal and stripped
which we don't build by default anyway. This also stopps confusing
others.

2 files changed, 0 insertions, 67 deletions

diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index bca01d184..8e5753522 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -65,7 +65,6 @@ lb chroot_localization ${*}
 lb chroot_local-includes ${*}
 lb chroot_local-patches ${*}
 lb chroot_local-hooks ${*}
-lb chroot_hooks ${*}
 lb chroot_hacks ${*}
 lb chroot_interactive ${*}
 
diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/lb_chroot_hooks
deleted file mode 100755
index 0251b3507..000000000
--- a/scripts/build/lb_chroot_hooks
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel@debian.org>
-##
-## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Including common functions
-. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'execute hooks in chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin executing hooks..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_hooks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Processing hooks
-HOOKS="$(echo ${LB_HOOKS} ${LB_PACKAGE_LISTS} ${LB_TASKS} | sed -e 's| |\n|g' | sort -u)"
-
-for HOOK in ${HOOKS}
-do
-	if [ -f ${LB_BASE:-/usr/share/live/build}/hooks/"${HOOK}" ]
-	then
-		# Copying hook
-		cp ${LB_BASE:-/usr/share/live/build}/hooks/"${HOOK}" chroot/root
-
-		# Making hook executable
-		if [ ! -x chroot/root/"${HOOK}" ]
-		then
-			chmod +x chroot/root/"${HOOK}"
-		fi
-
-		# Executing hook
-		Chroot chroot "./root/${HOOK}" || { Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
-
-		# Removing hook
-		rm -f chroot/root/"${HOOK}"
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_hooks
-	fi
-done