Commit e0f139ad authored by Simo Leone's avatar Simo Leone Committed by Dan McGee
Browse files

Separate mounting from config copying 



Copying the configs before installing stuff
caused conflicts. Running the host's pacman
uses the host's configuration anyway, so
there is no need to copy them in this case.

Signed-off-by: default avatarSimo Leone <simo@archlinux.org>
Signed-off-by: default avatarDan McGee <dan@archlinux.org>
parent 0410fb0a

mkarchroot

+6 −1
Original line number Diff line number Diff line
@@ -81,13 +81,17 @@ chroot_mount () 
    [ -e "${working_dir}/var/cache/pacman" ] || mkdir -p "${working_dir}/var/cache/pacman"

    mount -o bind /var/cache/pacman "${working_dir}/var/cache/pacman"



    trap 'chroot_umount' 0 1 2 15

}



copy_hostconf ()

{

    echo "copying mtab : /etc/mtab"

    cp /etc/mtab "${working_dir}/etc/mtab"



    echo "copying resolv.conf : /etc/resolv.conf"

    cp /etc/resolv.conf "${working_dir}/etc/resolv.conf"



    trap 'chroot_umount' 0 1 2 15

}



chroot_umount ()
@@ -110,6 +114,7 @@ if [ "$RUN" != "" ]; then 
    fi



    chroot_mount

    copy_hostconf



    echo "starting chroot ($RUN)"

    chroot "${working_dir}" ${RUN}