From ea491a1a1a81fecfe43ff02a9a627a9f9a9eea85 Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Tue, 10 Jan 2012 19:38:02 +0100 Subject: Fix pathname for running hooks in lb_chroot_hooks. lb_chroot_hooks would copy the hooks to run to chroot/root/lb_chroot_hooks, but then try to run them from chroot/root (which obviously fails). This means lb_chroot_hooks has not been working for hooks from /usr/share/live/build/hooks since lb_chroot_hooks was added in revision e4793268. Running hooks from the config directory was unaffected. --- scripts/build/lb_chroot_hooks | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/lb_chroot_hooks index 37f26df28..a0459335d 100755 --- a/scripts/build/lb_chroot_hooks +++ b/scripts/build/lb_chroot_hooks @@ -55,8 +55,8 @@ if ls chroot/root/lb_chroot_hooks/* > /dev/null 2>&1 then for _HOOK in chroot/root/lb_chroot_hooks/* do - Chroot chroot "/root/$(basename ${_HOOK})" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;} - rm -f chroot/root/"$(basename ${_HOOK})" + Chroot chroot "/root/lb_chroot_hooks/$(basename ${_HOOK})" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;} + rm -f chroot/root/lb_chroot_hooks/"$(basename ${_HOOK})" done rmdir chroot/root/lb_chroot_hooks -- cgit v1.2.3