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

[revert] the last four commits

Browse source
This commit is contained in:
Philip 2016-06-20 07:56:39 +02:00
parent 9ac4a3a520
commit 12d5dfead1
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/buildiso.in
View file

@ -168,10 +168,6 @@ done
shift $(($OPTIND - 1)) shift $(($OPTIND - 1))
import ${LIBDIR}/util-iso.sh
check_requirements
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
@ -186,6 +182,10 @@ 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}"

2
bin/buildpkg.in
View file

@ -149,8 +149,6 @@ eval_build_list "${list_dir_pkg}" "${build_list_pkg}"
prepare_dir "${pkg_dir}" prepare_dir "${pkg_dir}"
prepare_dir "${log_dir}"
init_base_devel init_base_devel
${pretend} && display_settings && exit ${pretend} && display_settings && exit

2
lib/util-iso.sh
View file

@ -586,7 +586,6 @@ check_requirements(){
else else
iso_fs="aufs" iso_fs="aufs"
fi fi
import ${LIBDIR}/util-iso-${iso_fs}.sh
} }
sign_iso(){ sign_iso(){
@ -639,6 +638,7 @@ 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}"