diff options
| author | Matthijs Kooijman <matthijs@stdin.nl> | 2012-01-10 19:38:02 +0100 |
|---|---|---|
| committer | Matthijs Kooijman <matthijs@stdin.nl> | 2012-01-10 21:54:58 +0100 |
| commit | ea491a1a1a81fecfe43ff02a9a627a9f9a9eea85 (patch) | |
| tree | f2c982145da771f0f99d535b2d2fe38e5fe61953 | |
| parent | dbe6a82bc031ecc8d9ba4230350bdd6277f905f6 (diff) | |
| download | vyos-live-build-ea491a1a1a81fecfe43ff02a9a627a9f9a9eea85.tar.gz vyos-live-build-ea491a1a1a81fecfe43ff02a9a627a9f9a9eea85.zip | |
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.
| -rwxr-xr-x | scripts/build/lb_chroot_hooks | 4 |
1 files 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 |