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

[util-iso] add umount_image_handler

Browse source
This commit is contained in:
udeved 2015-01-26 02:09:18 +01:00
parent 0e3e8b2906
commit 5cfcebb7f0
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/util-iso.sh
View file

@ -504,13 +504,23 @@ aufs_remove_image(){
fi
}
umount_image_handler(){
aufs_remove_image "${work_dir}/livecd-image"
aufs_remove_image "${work_dir}/${desktop}-image"
aufs_remove_image "${work_dir}/root-image"
aufs_remove_image "${work_dir}/pkgs-image"
aufs_remove_image "${work_dir}/lng-image"
aufs_remove_image "${work_dir}/boot-image"
}
# Base installation (root-image)
make_image_root() {
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
msg "Prepare [Base installation] (root-image)"
mkiso ${create_args[*]} -p "${packages}" -i "root-image" create "${work_dir}" || die "Please check your Packages file! Exiting."
mkiso ${create_args[*]} -p "${packages}" -i "root-image" create "${work_dir}" || \
die "Please check your Packages file! Exiting."
pacman -Qr "${work_dir}/root-image" > "${work_dir}/root-image/root-image-pkgs.txt"
@ -535,11 +545,14 @@ make_image_de() {
mkdir -p ${work_dir}/${desktop}-image
aufs_remove_image "${work_dir}/${desktop}-image"
# aufs_remove_image "${work_dir}/${desktop}-image"
umount_image_handler
aufs_mount_root_image "${work_dir}/${desktop}-image"
mkiso ${create_args[*]} -i "${desktop}-image" -p "${packages_de}" create "${work_dir}" || die "Please check your Packages-${desktop} file! Exiting."
mkiso ${create_args[*]} -i "${desktop}-image" -p "${packages_de}" create "${work_dir}" || \
umount_image_handler && \
die "Please check your Packages-${desktop} file! Exiting."
pacman -Qr "${work_dir}/${desktop}-image" > "${work_dir}/${desktop}-image/${desktop}-image-pkgs.txt"
@ -565,7 +578,8 @@ make_image_livecd() {
mkdir -p ${work_dir}/livecd-image
aufs_remove_image "${work_dir}/livecd-image"
# aufs_remove_image "${work_dir}/livecd-image"
umount_image_handler
if [ -n "${desktop}" ] ; then
aufs_mount_de_image "${work_dir}/livecd-image"
@ -574,7 +588,9 @@ make_image_livecd() {
aufs_mount_root_image "${work_dir}/livecd-image"
fi
mkiso ${create_args[*]} -i "livecd-image" -p "${packages_livecd}" create "${work_dir}" || die "Please check your Packages-Livecd file! Exiting."
mkiso ${create_args[*]} -i "livecd-image" -p "${packages_livecd}" create "${work_dir}" || \
umount_image_handler && \
die "Please check your Packages-Livecd file! Exiting."
pacman -Qr "${work_dir}/livecd-image" > "${work_dir}/livecd-image/livecd-image-pkgs.txt"
@ -605,7 +621,8 @@ make_image_xorg() {
mkdir -p ${work_dir}/pkgs-image/opt/livecd/pkgs
aufs_remove_image "${work_dir}/pkgs-image"
# aufs_remove_image "${work_dir}/pkgs-image"
umount_image_handler
if [[ -n "${desktop}" ]] ; then
aufs_mount_de_image "${work_dir}/pkgs-image"
@ -644,7 +661,8 @@ make_image_lng() {
msg "Prepare [lng-image]"
mkdir -p ${work_dir}/lng-image/opt/livecd/lng
aufs_remove_image "${work_dir}/lng-image"
# aufs_remove_image "${work_dir}/lng-image"
umount_image_handler
if [[ -n "${desktop}" ]] ; then
aufs_mount_de_image "${work_dir}/lng-image"