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

buildiso: reestore default error handling

Browse source
This commit is contained in:
udeved 2017-05-08 01:09:47 +02:00
parent ab5d0deb47
commit 3278c1df91
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/util-chroot.sh
View file

@ -46,11 +46,8 @@ subvolume_delete_recursive() {
create_chroot(){ create_chroot(){
local timer=$(get_timer) local timer=$(get_timer)
# local dest="$1"
# prepare_dir "$dest"
setarch "${target_arch}" \ setarch "${target_arch}" \
mkchroot "$@" || abort mkchroot "$@"
show_elapsed_time "${FUNCNAME}" "${timer}" show_elapsed_time "${FUNCNAME}" "${timer}"
} }

6
lib/util-iso.sh
View file

@ -283,7 +283,7 @@ make_image_root() {
prepare_dir "${rootfs}" prepare_dir "${rootfs}"
create_chroot "${mkchroot_args[@]}" "${rootfs}" "${packages[@]}" || die create_chroot "${mkchroot_args[@]}" "${rootfs}" "${packages[@]}"
pacman -Qr "${rootfs}" > "${rootfs}/rootfs-pkgs.txt" pacman -Qr "${rootfs}" > "${rootfs}/rootfs-pkgs.txt"
copy_overlay "${profile_dir}/root-overlay" "${rootfs}" copy_overlay "${profile_dir}/root-overlay" "${rootfs}"
@ -307,7 +307,7 @@ make_image_desktop() {
mount_fs_root "${desktopfs}" mount_fs_root "${desktopfs}"
create_chroot "${mkchroot_args[@]}" "${desktopfs}" "${packages[@]}" || die create_chroot "${mkchroot_args[@]}" "${desktopfs}" "${packages[@]}"
pacman -Qr "${desktopfs}" > "${desktopfs}/desktopfs-pkgs.txt" pacman -Qr "${desktopfs}" > "${desktopfs}/desktopfs-pkgs.txt"
cp "${desktopfs}/desktopfs-pkgs.txt" ${iso_dir}/$(gen_iso_fn)-pkgs.txt cp "${desktopfs}/desktopfs-pkgs.txt" ${iso_dir}/$(gen_iso_fn)-pkgs.txt
@ -340,7 +340,7 @@ make_image_live() {
mount_fs_select "${livefs}" mount_fs_select "${livefs}"
create_chroot "${mkchroot_args[@]}" "${livefs}" "${packages[@]}" || die create_chroot "${mkchroot_args[@]}" "${livefs}" "${packages[@]}"
pacman -Qr "${livefs}" > "${livefs}/livefs-pkgs.txt" pacman -Qr "${livefs}" > "${livefs}/livefs-pkgs.txt"
copy_overlay "${profile_dir}/live-overlay" "${livefs}" copy_overlay "${profile_dir}/live-overlay" "${livefs}"