root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[buildiso] another try to fix 52ce7f8

Browse source
This commit is contained in:
Philip 2016-06-18 09:50:44 +02:00
parent 8b85208339
commit f0d2b1dcf1
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bin/buildiso.in
View file

@ -18,7 +18,6 @@ SYSCONFDIR='@sysconfdir@'
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
import ${LIBDIR}/util.sh
import ${LIBDIR}/util-iso.sh
show_profile(){
prepare_profile "$1"
@ -169,6 +168,10 @@ done
shift $(($OPTIND - 1))
check_requirements
import ${LIBDIR}/util-iso.sh
for sig in TERM HUP QUIT; do
trap "trap_exit $sig \"$(gettext "%s signal caught. Exiting...")\" \"$sig\"" "$sig"
done
@ -183,10 +186,6 @@ prepare_dir "${tmp_dir}"
eval_build_list "${list_dir_iso}" "${build_list_iso}"
import ${LIBDIR}/util-iso.sh
check_requirements
${pretend} && display_settings && exit 1
run build "${build_list_iso}"

2
lib/util-iso.sh
View file

@ -586,6 +586,7 @@ check_requirements(){
else
iso_fs="aufs"
fi
import ${LIBDIR}/util-iso-${iso_fs}.sh
}
sign_iso(){
@ -638,7 +639,6 @@ prepare_images(){
make_profile(){
msg "Start building [%s]" "${profile}"
import ${LIBDIR}/util-iso-${iso_fs}.sh
${clean_first} && chroot_clean "${work_dir}"
if ${iso_only}; then
[[ ! -d ${work_dir} ]] && die "Create images: buildiso -p %s -x" "${profile}"