root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

[util-iso] use new func to initialize the right branch chroot

Browse source
This commit is contained in:
udeved 2015-06-02 18:11:26 +02:00
parent e1b7478046
commit 361c80bf5f
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/util-iso.sh
View file

@ -197,7 +197,9 @@ make_image_root() {
msg "Prepare [Base installation] (root-image)" msg "Prepare [Base installation] (root-image)"
local path="${work_dir}/root-image" local path="${work_dir}/root-image"
mkdir -p ${path} mkdir -p ${path}
set_core_branch "${pacman_conf}"
make_chroot "${path}" "${packages}" make_chroot "${path}" "${packages}"
fix_pacman_conf "${path}"
clean_up_image "${path}" clean_up_image "${path}"
pacman -Qr "${path}" > "${path}/root-image-pkgs.txt" pacman -Qr "${path}" > "${path}/root-image-pkgs.txt"
configure_lsb "${path}" configure_lsb "${path}"
@ -215,7 +217,9 @@ make_image_custom() {
mkdir -p ${path} mkdir -p ${path}
umount_image_handler umount_image_handler
aufs_mount_root_image "${path}" aufs_mount_root_image "${path}"
#set_core_branch "${pacman_conf}"
make_chroot "${path}" "${packages}" make_chroot "${path}" "${packages}"
#fix_pacman_conf "${path}"
clean_up_image "${path}" clean_up_image "${path}"
pacman -Qr "${path}" > "${path}/${custom}-image-pkgs.txt" pacman -Qr "${path}" > "${path}/${custom}-image-pkgs.txt"
cp "${path}/${custom}-image-pkgs.txt" ${cache_dir_iso}/${iso_name}-${custom}-${dist_release}-${arch}-pkgs.txt cp "${path}/${custom}-image-pkgs.txt" ${cache_dir_iso}/${iso_name}-${custom}-${dist_release}-${arch}-pkgs.txt
@ -241,7 +245,9 @@ make_image_livecd() {
else else
aufs_mount_root_image "${path}" aufs_mount_root_image "${path}"
fi fi
#set_core_branch "${pacman_conf}"
make_chroot "${path}" "${packages}" make_chroot "${path}" "${packages}"
#fix_pacman_conf "${path}"
clean_up_image "${path}" clean_up_image "${path}"
pacman -Qr "${path}" > "${path}/livecd-image-pkgs.txt" pacman -Qr "${path}" > "${path}/livecd-image-pkgs.txt"
copy_overlay_livecd "${path}" copy_overlay_livecd "${path}"