[buildiso] another try to fix 52ce7f8
This commit is contained in:
parent
8b85208339
commit
f0d2b1dcf1
2 changed files with 5 additions and 6 deletions
|
@ -18,7 +18,6 @@ SYSCONFDIR='@sysconfdir@'
|
||||||
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
||||||
|
|
||||||
import ${LIBDIR}/util.sh
|
import ${LIBDIR}/util.sh
|
||||||
import ${LIBDIR}/util-iso.sh
|
|
||||||
|
|
||||||
show_profile(){
|
show_profile(){
|
||||||
prepare_profile "$1"
|
prepare_profile "$1"
|
||||||
|
@ -169,6 +168,10 @@ done
|
||||||
|
|
||||||
shift $(($OPTIND - 1))
|
shift $(($OPTIND - 1))
|
||||||
|
|
||||||
|
check_requirements
|
||||||
|
|
||||||
|
import ${LIBDIR}/util-iso.sh
|
||||||
|
|
||||||
for sig in TERM HUP QUIT; do
|
for sig in TERM HUP QUIT; do
|
||||||
trap "trap_exit $sig \"$(gettext "%s signal caught. Exiting...")\" \"$sig\"" "$sig"
|
trap "trap_exit $sig \"$(gettext "%s signal caught. Exiting...")\" \"$sig\"" "$sig"
|
||||||
done
|
done
|
||||||
|
@ -183,10 +186,6 @@ prepare_dir "${tmp_dir}"
|
||||||
|
|
||||||
eval_build_list "${list_dir_iso}" "${build_list_iso}"
|
eval_build_list "${list_dir_iso}" "${build_list_iso}"
|
||||||
|
|
||||||
import ${LIBDIR}/util-iso.sh
|
|
||||||
|
|
||||||
check_requirements
|
|
||||||
|
|
||||||
${pretend} && display_settings && exit 1
|
${pretend} && display_settings && exit 1
|
||||||
|
|
||||||
run build "${build_list_iso}"
|
run build "${build_list_iso}"
|
||||||
|
|
|
@ -586,6 +586,7 @@ check_requirements(){
|
||||||
else
|
else
|
||||||
iso_fs="aufs"
|
iso_fs="aufs"
|
||||||
fi
|
fi
|
||||||
|
import ${LIBDIR}/util-iso-${iso_fs}.sh
|
||||||
}
|
}
|
||||||
|
|
||||||
sign_iso(){
|
sign_iso(){
|
||||||
|
@ -638,7 +639,6 @@ prepare_images(){
|
||||||
|
|
||||||
make_profile(){
|
make_profile(){
|
||||||
msg "Start building [%s]" "${profile}"
|
msg "Start building [%s]" "${profile}"
|
||||||
import ${LIBDIR}/util-iso-${iso_fs}.sh
|
|
||||||
${clean_first} && chroot_clean "${work_dir}"
|
${clean_first} && chroot_clean "${work_dir}"
|
||||||
if ${iso_only}; then
|
if ${iso_only}; then
|
||||||
[[ ! -d ${work_dir} ]] && die "Create images: buildiso -p %s -x" "${profile}"
|
[[ ! -d ${work_dir} ]] && die "Create images: buildiso -p %s -x" "${profile}"
|
||||||
|
|
Loading…
Reference in a new issue