summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Leone <simo@archlinux.org>2008-02-06 06:59:53 +0100
committerDan McGee <dan@archlinux.org>2008-02-06 17:09:07 +0100
commite0f139ad0e2b4144c39fa4431d174f453eb0ca52 (patch)
treecc4be8e8e0bfcb9fa4e54b83a83450d5e3ac216a
parent0410fb0a2f2bdaf3d127e54ec232eddbfc0f70dd (diff)
downloaddevtools-e0f139ad0e2b4144c39fa4431d174f453eb0ca52.tar.gz
devtools-e0f139ad0e2b4144c39fa4431d174f453eb0ca52.tar.xz
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 <simo@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rwxr-xr-xmkarchroot7
1 files changed, 6 insertions, 1 deletions
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}