manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chroot: improve directory creation/destruction efficiency 

Closes: #952924
This commit is contained in:
jnqnfe 2015-01-07 21:53:42 +00:00 committed by Luca Boccassi
parent 0dee07f122
commit 532144ce66
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/build/chroot_hooks
View File

@ -47,6 +47,7 @@ mount -o bind config chroot/live-build/config
mount -o remount,ro,bind config chroot/live-build/config mount -o remount,ro,bind config chroot/live-build/config
# Copying hooks # Copying hooks
mkdir -p chroot/root/lb_chroot_hooks
for _HOOK in ${LB_CHROOT_HOOKS} for _HOOK in ${LB_CHROOT_HOOKS}
do do
for LOCATION in "${LIVE_BUILD}/hooks" /usr/share/live/build/hooks for LOCATION in "${LIVE_BUILD}/hooks" /usr/share/live/build/hooks
@ -55,7 +56,6 @@ do
do do
if [ -e "${FILE}" ] if [ -e "${FILE}" ]
then then
mkdir -p chroot/root/lb_chroot_hooks
cp "${FILE}" chroot/root/lb_chroot_hooks cp "${FILE}" chroot/root/lb_chroot_hooks
fi fi
done done
@ -70,9 +70,9 @@ then
Chroot chroot "/root/lb_chroot_hooks/$(basename ${_HOOK})" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;} 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})" rm -f chroot/root/lb_chroot_hooks/"$(basename ${_HOOK})"
done done
rmdir chroot/root/lb_chroot_hooks
fi fi
rmdir chroot/root/lb_chroot_hooks
rmdir --ignore-fail-on-non-empty chroot/root
## Processing local hooks ## Processing local hooks
if ls config/hooks/normal/*.chroot config/hooks/live/*.chroot > /dev/null 2>&1 if ls config/hooks/normal/*.chroot config/hooks/live/*.chroot > /dev/null 2>&1