diff --git a/bin/buildiso.in b/bin/buildiso.in index 7e76baf..838f390 100755 --- a/bin/buildiso.in +++ b/bin/buildiso.in @@ -168,10 +168,6 @@ done shift $(($OPTIND - 1)) -import ${LIBDIR}/util-iso.sh - -check_requirements - for sig in TERM HUP QUIT; do trap "trap_exit $sig \"$(gettext "%s signal caught. Exiting...")\" \"$sig\"" "$sig" done @@ -186,6 +182,10 @@ 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}" diff --git a/bin/buildpkg.in b/bin/buildpkg.in index f50bc62..7482d79 100644 --- a/bin/buildpkg.in +++ b/bin/buildpkg.in @@ -149,8 +149,6 @@ eval_build_list "${list_dir_pkg}" "${build_list_pkg}" prepare_dir "${pkg_dir}" -prepare_dir "${log_dir}" - init_base_devel ${pretend} && display_settings && exit diff --git a/lib/util-iso.sh b/lib/util-iso.sh index 109a651..47fa461 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -586,7 +586,6 @@ check_requirements(){ else iso_fs="aufs" fi - import ${LIBDIR}/util-iso-${iso_fs}.sh } sign_iso(){ @@ -639,6 +638,7 @@ 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}"