From e0f139ad0e2b4144c39fa4431d174f453eb0ca52 Mon Sep 17 00:00:00 2001 From: Simo Leone Date: Tue, 5 Feb 2008 23:59:53 -0600 Subject: 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: Simo Leone Signed-off-by: Dan McGee --- mkarchroot | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mkarchroot b/mkarchroot index a68508f..58065b3 100755 --- a/mkarchroot +++ b/mkarchroot @@ -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} -- cgit v1.2.3-24-g4f1b