R/builder
2
0
Fork 0
forked from Spark/builder
Code Issues Pull Requests Releases Wiki Activity

cleanup

Browse Source 
Signed-off-by: fbt <fbt@fleshless.org>
This commit is contained in:
Jack L. Frost 2017-11-22 15:48:15 +03:00
parent 7f34912c09
commit 7f8adff698
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
makepkg-overlay
View File

@ -37,7 +37,7 @@ cnt="_makepkg.$$"
cnt_dir="$wrk_dir/containers/$cnt" cnt_dir="$wrk_dir/containers/$cnt"
# Create new container # Create new container
lxf -r builder -i base new "$cnt" lxf -r builder -i base new "$cnt" || exit $?
# Unmount the thing in any case # Unmount the thing in any case
trap 'cleanup' INT TERM EXIT trap 'cleanup' INT TERM EXIT
@ -47,8 +47,7 @@ buildscript > "$cnt_dir/rootfs/init"
chmod 755 "$cnt_dir/rootfs/init" chmod 755 "$cnt_dir/rootfs/init"
# Start the container # Start the container
lxc-start -n "$cnt" -F /init; lxc_exit=$? lxc-start -n "$cnt" -F /init || exit $?
(( lxc_exit )) && exit "$lxc_exit"
# Put the artifacts where asked to # Put the artifacts where asked to
[[ "$pkg_dest" ]] && { [[ "$pkg_dest" ]] && {